Improved XML Parsing