Slight refactoring of the CatalogMangerV2