Updated XML output; mapping nodes to text