Change Locator constructor to new key pattern