Added column reordering