Refactor common CatalogUtils step 1