ServiceLocator added