Changed the Entity to a UniqueIdentifier