Refactor order schema