LPS-45080 Use new ServiceRegistryMap and StringServiceRegistryMap pattern