Updated old XMLTool in src.util