Added Service Locator pattern support.