Improved XmlHelper