Modified Locator class