Change the column definitions to be easier to pick up