CSVParser improvements