Changed Locator and LocatorInterface classes