WIP version aware locators