Added EntityType Enum