Added service locator