Added key index type to the Entity.