Moving code to the Catalog