Updated for CSV style files