Removed usage of Constraint, used Lookup instead
GIS lookup support added