Updated locators and workflow