Added EntityId next to the Entity property :|