Use new column definitions