Enhancements to csv_reader