Actually simplified service locator.