EntityModel Fixes
Merge commit
Merge commit #2