add more validations