Untested update of the XML wrapper for the tool