Start adding support for csv import