Adding support for other kinds of locators