change Catalog to CatalogServer, change indent