Refactor service locator interface