Final updates to Catalog