XSD updates