Added indexer update and tests