Updated CSV reader/writer