Updated to new XML processor