Refactor order match order object model.