Added EntityStatus field, added constructor, refactored a bit