CsvReader updates and model definitions