Improve CSV import