Enhancement Support for locator constraints