Added resolution of locators