Added EntityType to all GuidEntities