Structural changes to XmlToolkit