XSD changes