Added constrant on the Lookup type; removed temporary Mapper distrinct-constraint