Added ServiceLocator support