Improved the CSV import mechanism
Small changes