Feature/dedicated locators