Functional improvements to the xml parser