Catalog Repair and construction