Added unique validations