Work on export data formatting