Added support for CSV output