Moved locators to common file