Changed service locator to singleton