Replaced the Entity by a UniqueIdentifier