Changes for XML formatter