diff --git a/src/typeagent/knowpro/add_messages.py b/src/typeagent/knowpro/add_messages.py
index 4418b972..c2710864 100644
--- a/src/typeagent/knowpro/add_messages.py
+++ b/src/typeagent/knowpro/add_messages.py
@@ -13,7 +13,7 @@
 
 from . import knowledge_schema as kplib
 from ..aitools.embeddings import IEmbeddingModel, NormalizedEmbedding
-from ..storage.memory.semrefindex import collect_action_terms, collect_entity_terms
+from ..storage.memory import semrefindex
 from .interfaces import AddMessagesResult
 from .interfaces_core import IKnowledgeExtractor, IMessage, MessageOrdinal, TextLocation
 
@@ -251,11 +251,11 @@ def _add_term(term: str) -> None:
             related_terms.append(canonical)
 
     for entity in knowledge.entities:
-        for term in collect_entity_terms(entity):
+        for term in semrefindex.collect_entity_terms(entity):
             _add_term(term)
 
     for action in chain(knowledge.actions, knowledge.inverse_actions):
-        for term in collect_action_terms(action):
+        for term in semrefindex.collect_action_terms(action):
             _add_term(term)
 
     for topic in knowledge.topics:
diff --git a/src/typeagent/mcp/server.py b/src/typeagent/mcp/server.py
index 8fb4d03e..cc6217ca 100644
--- a/src/typeagent/mcp/server.py
+++ b/src/typeagent/mcp/server.py
@@ -30,7 +30,7 @@
 from typeagent.knowpro.convsettings import ConversationSettings
 from typeagent.knowpro.search_query_schema import SearchQuery
 from typeagent.podcasts import podcast
-from typeagent.storage.memory.semrefindex import TermToSemanticRefIndex
+from typeagent.storage.memory import semrefindex
 from typeagent.storage.utils import create_storage_provider
 
 # Example podcast index path for documentation and error messages
@@ -104,7 +104,7 @@ class ProcessingContext:
     lang_search_options: searchlang.LanguageSearchOptions
     answer_context_options: answers.AnswerContextOptions
     query_context: query.QueryEvalContext[
-        podcast.PodcastMessage, TermToSemanticRefIndex
+        podcast.PodcastMessage, semrefindex.TermToSemanticRefIndex
     ]
     embedding_model: embeddings.IEmbeddingModel
     query_translator: typechat.TypeChatJsonTranslator[SearchQuery]
diff --git a/src/typeagent/storage/memory/provider.py b/src/typeagent/storage/memory/provider.py
index 230b5b0a..2feeb003 100644
--- a/src/typeagent/storage/memory/provider.py
+++ b/src/typeagent/storage/memory/provider.py
@@ -5,6 +5,7 @@
 
 from datetime import datetime, timezone
 
+from . import semrefindex
 from ...knowpro.convsettings import MessageTextIndexSettings, RelatedTermIndexSettings
 from ...knowpro.interfaces import (
     ChunkFailure,
@@ -24,7 +25,6 @@
 from .messageindex import MessageTextIndex
 from .propindex import PropertyIndex
 from .reltermsindex import RelatedTermsIndex
-from .semrefindex import TermToSemanticRefIndex
 from .timestampindex import TimestampToTextRangeIndex
 
 
@@ -34,7 +34,7 @@ class MemoryStorageProvider[TMessage: IMessage](IStorageProvider[TMessage]):
     _message_collection: MemoryMessageCollection[TMessage]
     _semantic_ref_collection: MemorySemanticRefCollection
 
-    _conversation_index: TermToSemanticRefIndex
+    _conversation_index: semrefindex.TermToSemanticRefIndex
     _property_index: PropertyIndex
     _timestamp_index: TimestampToTextRangeIndex
     _message_text_index: MessageTextIndex
@@ -57,7 +57,7 @@ def __init__(
         )
         self._semantic_ref_collection = MemorySemanticRefCollection()
 
-        self._conversation_index = TermToSemanticRefIndex()
+        self._conversation_index = semrefindex.TermToSemanticRefIndex()
         self._property_index = PropertyIndex()
         self._timestamp_index = TimestampToTextRangeIndex()
         self._related_terms_index = RelatedTermsIndex(related_terms_settings)