CSV import improved