xsd improvements