Enhancement Support for Uniqueness constraint