[AdgPath] Using CpmlPath where applicable