Improved data export formats - include all classes, with modifiers tacked on the end