Added support for the new ServiceLocator