Ensure column order is maintained