XML Validation changes