[DELIVERS BUGFIX #65388048 ORBEST] Changing Type model to from Entity to ValueObject.