Added support for composing a csv with the tabular data as well