Updated NCSV conversion