Added constructors, refactored a bit, updated Status to EntityStatus