oh yes. Maybe we need to change CsvExtractor too. Better maybe ?