Created entities to reflect Order inheritance
Merged with master