Changes to datatypes to support auto-XSD-generation