diff --git a/trustgraph-flow/trustgraph/model/prompt/template/service.py b/trustgraph-flow/trustgraph/model/prompt/template/service.py
index 981c76cc..f60d3f45 100755
--- a/trustgraph-flow/trustgraph/model/prompt/template/service.py
+++ b/trustgraph-flow/trustgraph/model/prompt/template/service.py
@@ -7,15 +7,15 @@ import asyncio
 import json
 import re
 
-from .... schema import Definition, Relationship, Triple
-from .... schema import Topic
-from .... schema import PromptRequest, PromptResponse, Error
-from .... schema import TextCompletionRequest, TextCompletionResponse
+from ....schema import Definition, Relationship, Triple
+from ....schema import Topic
+from ....schema import PromptRequest, PromptResponse, Error
+from ....schema import TextCompletionRequest, TextCompletionResponse
 
-from .... base import FlowProcessor
-from .... base import ProducerSpec, ConsumerSpec, TextCompletionClientSpec
+from ....base import FlowProcessor
+from ....base import ProducerSpec, ConsumerSpec, TextCompletionClientSpec
 
-from . prompt_manager import PromptConfiguration, Prompt, PromptManager
+from ..template import PromptConfiguration, Prompt, PromptManager
 
 default_ident = "prompt"
 default_concurrency = 1
@@ -64,9 +64,7 @@ class Processor(FlowProcessor):
         self.register_config_handler(self.on_prompt_config)
 
         # Null configuration, should reload quickly
-        self.manager = PromptManager(
-            config = PromptConfiguration("", {}, {})
-        )
+        self.manager = PromptManager()
 
     async def on_prompt_config(self, config, version):
 
@@ -80,34 +78,7 @@ class Processor(FlowProcessor):
 
         try:
 
-            system = json.loads(config["system"])
-            ix = json.loads(config["template-index"])
-
-            prompts = {}
-
-            for k in ix:
-
-                pc = config[f"template.{k}"]
-                data = json.loads(pc)
-
-                prompt = data.get("prompt")
-                rtype = data.get("response-type", "text")
-                schema = data.get("schema", None)
-
-                prompts[k] = Prompt(
-                    template = prompt,
-                    response_type = rtype,
-                    schema = schema,
-                    terms = {}
-                )
-
-            self.manager = PromptManager(
-                PromptConfiguration(
-                    system,
-                    {},
-                    prompts
-                )
-            )
+            self.manager.load_config(config)
 
             print("Prompt configuration reloaded.", flush=True)
 
diff --git a/trustgraph-flow/trustgraph/templates/prompt_manager.py b/trustgraph-flow/trustgraph/templates/prompt_manager.py
index c5c32395..844f3b0b 100644
--- a/trustgraph-flow/trustgraph/templates/prompt_manager.py
+++ b/trustgraph-flow/trustgraph/templates/prompt_manager.py
@@ -19,10 +19,10 @@ class Prompt:
 
 class PromptManager:
 
-    def __init__(self, config):
-        self.config = config
-        self.terms = config.global_terms
+    def __init__(self, {}):
 
+        self.config = PromptConfiguration("", {}, {})
+        self.terms = config.global_terms
         self.prompts = config.prompts
 
         try:
@@ -40,6 +40,35 @@ class PromptManager:
             if v.terms is None:
                 v.terms = {}
 
+    def load_config(self, config):
+
+        system = json.loads(config["system"])
+        ix = json.loads(config["template-index"])
+
+        prompts = {}
+
+        for k in ix:
+
+            pc = config[f"template.{k}"]
+            data = json.loads(pc)
+
+            prompt = data.get("prompt")
+            rtype = data.get("response-type", "text")
+            schema = data.get("schema", None)
+
+            prompts[k] = Prompt(
+                template = prompt,
+                response_type = rtype,
+                schema = schema,
+                terms = {}
+            )
+
+        self.config = PromptConfiguration(
+            system,
+            {},
+            prompts
+        )
+
     def parse_json(self, text):
         json_match = re.search(r'```(?:json)?(.*?)```', text, re.DOTALL)
     
@@ -51,9 +80,7 @@ class PromptManager:
 
         return json.loads(json_str)
 
-    async def invoke(self, id, input, llm):
-
-        print("Invoke...", flush=True)
+    async def render(self, id, input):
 
         if id not in self.prompts:
             raise RuntimeError("ID invalid")
@@ -62,9 +89,17 @@ class PromptManager:
 
         resp_type = self.prompts[id].response_type
 
+        return self.templates[id].render(terms)
+
+    async def invoke(self, id, input, llm):
+
+        print("Invoke...", flush=True)
+
+        resp_type = self.prompts[id].response_type
+
         prompt = {
             "system": self.system_template.render(terms),
-            "prompt": self.templates[id].render(terms)
+            "prompt": self.render(id, input)
         }
 
         resp = await llm(**prompt)