Continue refactoring Locators to Key api