Added EntityId index