refactor xsd