Added support for optional CSV and TSV output