ENH: Improved XML