Improve XML output