Updated to xsd version 2.0M