Added additional fields to populate the indexed Entity.