Updates to fix XML data model.