refactored internals of RegistrationCatalogCollector