Added Locator Capability