Adding column headers and more parameters