Validation changes