Added CSV backwards compatibiity