Implemented abstract Entity with Model semantics
Fix to entity model