Added uniqueness constraints