Modified indexer so it can do full indexing