Add option to return CSV as rows/columns