More Catalog File updates

More Catalog File updates