Modified the Entity class