Improve the CSV importer