Validation changes added