Remove support for chaining from internal API
Re-organize the column headers