Added service locator patterns