Refactor Order model