Add some more fields to export data