Updated column ordering