CSV Support Improvements