Update to latest changes in Service Locator