Added order_number fields