Adhere to new Locator API constraints