Support for more CSV data formats

The comment is probably not right at this point.