Improvements to XML structure