Fixed Make/Model inconsistency, added Order support to Model