New version with more XSD fixes