XmlHelper modified