Added ServiceLocatorImplBase