Added uniqueness validation