More work on new XML parsing