Added new fields to indexer