added multiple locator support