Added more defines for CSV lengths