Enhance some of the catalog service and domain