Refactored Entity