Improved XML reader.