Add legacy CSV and JSON support also