Changed the structure of the data.xml file, so it is more robust and export failures are more unlikely to happen