updated for the xsd