#457 | Changes to incorporate CSVFile refactoring