Added Locator class