Updated form validations