Updated XMLTool usage

Now using new version of XMLTool in main util.