more changes on XSD.