Refactor to use CSVDataSetModel