Updated from new xsd.