Better CSV header handling