Update for new xsd's