Reworked for CSV import