Re-did xsd