diff --git a/src/typeagent/knowpro/add_messages.py b/src/typeagent/knowpro/add_messages.py
index 3d62d03f..295143a8 100644
--- a/src/typeagent/knowpro/add_messages.py
+++ b/src/typeagent/knowpro/add_messages.py
@@ -12,7 +12,7 @@
 import typechat
 
 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,
     IKnowledgeExtractor,
@@ -256,11 +256,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 e2b52ef3..1ebf2121 100644
--- a/src/typeagent/mcp/server.py
+++ b/src/typeagent/mcp/server.py
@@ -32,7 +32,7 @@
 from typeagent.knowpro.query import QueryEvalContext
 from typeagent.knowpro.search_query_schema import SearchQuery
 from typeagent.podcasts.podcast import Podcast, PodcastMessage
-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
@@ -105,7 +105,7 @@ async def complete(
 class ProcessingContext:
     lang_search_options: searchlang.LanguageSearchOptions
     answer_context_options: answers.AnswerContextOptions
-    query_context: QueryEvalContext[PodcastMessage, TermToSemanticRefIndex]
+    query_context: QueryEvalContext[PodcastMessage, semrefindex.TermToSemanticRefIndex]
     embedding_model: IEmbeddingModel
     query_translator: typechat.TypeChatJsonTranslator[SearchQuery]
     answer_translator: typechat.TypeChatJsonTranslator[AnswerResponse]
diff --git a/src/typeagent/storage/memory/provider.py b/src/typeagent/storage/memory/provider.py
index 5769ebc7..f9760518 100644
--- a/src/typeagent/storage/memory/provider.py
+++ b/src/typeagent/storage/memory/provider.py
@@ -5,7 +5,7 @@
 
 from datetime import datetime, timezone
 
-from . import propindex, reltermsindex
+from . import propindex, reltermsindex, semrefindex
 from ...knowpro.convsettings import MessageTextIndexSettings, RelatedTermIndexSettings
 from ...knowpro.interfaces import (
     ChunkFailure,
@@ -23,7 +23,6 @@
 from .collections import MemoryMessageCollection, MemorySemanticRefCollection
 from .convthreads import ConversationThreads
 from .messageindex import MessageTextIndex
-from .semrefindex import TermToSemanticRefIndex
 from .timestampindex import TimestampToTextRangeIndex
 
 
@@ -33,7 +32,7 @@ class MemoryStorageProvider[TMessage: IMessage](IStorageProvider[TMessage]):
     _message_collection: MemoryMessageCollection[TMessage]
     _semantic_ref_collection: MemorySemanticRefCollection
 
-    _conversation_index: TermToSemanticRefIndex
+    _conversation_index: semrefindex.TermToSemanticRefIndex
     _property_index: propindex.PropertyIndex
     _timestamp_index: TimestampToTextRangeIndex
     _message_text_index: MessageTextIndex
@@ -56,7 +55,7 @@ def __init__(
         )
         self._semantic_ref_collection = MemorySemanticRefCollection()
 
-        self._conversation_index = TermToSemanticRefIndex()
+        self._conversation_index = semrefindex.TermToSemanticRefIndex()
         self._property_index = propindex.PropertyIndex()
         self._timestamp_index = TimestampToTextRangeIndex()
         self._related_terms_index = reltermsindex.RelatedTermsIndex(