More features in CSV diag #www