Added Service Locator pattern