Added indexer and auto-completer service