added ServiceLocator