Updated order schema