Re-add CsvReader to feature branch