renamed service locator implementation