Moved Catalog Maintenance code to a separate class