Implement updated Locator interface