Added option to define column headers