Added a default service locator