Added more parsing of xml files.