Csv improvements