Added fields to index as well