Added uniqueness validation.