More changes to XSD