Updated the csv_reader and setup classes