Added locator class