CSV Parser final changes