Add more fields to CSV export