Better CSV handling