preliminary ServiceCatalog support