Refactoring to newest Catalog Service