Adding support to create catalogs