Added validation changes