Improve CSV export