Improved ordering on the output.xml