Some changes to the exported data fields

Just some minor changes