Add support for CSV output