More changes to reading the xml