Some updates to the CSV export format