Change validation to validate against XSD