XML export update, should now cover all the data structures
XML importing