Added ServiceLocator