Support changed CSV format