Changes to xsd for better data coverage
Merged