Work on XSD