diff --git a/.idea/misc.xml b/.idea/misc.xml
index cfebfa0..0ba3b46 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="25" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_26" default="true" project-jdk-name="26" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/API/src/main/java/me/neurodock/api/controllers/Message.java b/API/src/main/java/me/neurodock/api/controllers/Message.java
index bd0d9d3..e352289 100644
--- a/API/src/main/java/me/neurodock/api/controllers/Message.java
+++ b/API/src/main/java/me/neurodock/api/controllers/Message.java
@@ -28,7 +28,7 @@ public class Message {
         }
         Thread t = new Thread(() -> {
             apiApplication.getCore().getOllamaObject().addMessage(new OllamaMessage(OllamaMessageRole.USER, query));
-            apiApplication.getCore().handleResponse(apiApplication.getCore().qurryOllama());
+            //apiApplication.getCore().handleResponse(apiApplication.getCore().qurryOllama());
         });
         t.start();
         return ResponseEntity.ok("Query received");
diff --git a/Core/src/main/java/me/neurodock/core/Core.java b/Core/src/main/java/me/neurodock/core/Core.java
index f2b1f8f..c6bfaf9 100644
--- a/Core/src/main/java/me/neurodock/core/Core.java
+++ b/Core/src/main/java/me/neurodock/core/Core.java
@@ -33,6 +33,7 @@ import java.util.jar.JarFile;
 
 import static me.neurodock.ollama.OllamaFunctionArgument.deconstructOllamaFunctionArguments;
 import static me.neurodock.plugin.Plugin.UNKNOWN_PLUGIN;
+import static me.neurodock.plugin.tool.Tool.RPCP_SOURCE;
 
 /**
  * The Main class for the System, responsible for managing the OllamaObject, tools, and the Ollama API.
@@ -943,7 +944,7 @@ public class Core {
         /**
          * Runtime Pre-Compiled Plugins: external plugins loaded at runtime via Plugin-API.
          */
-        public static final String RPCP = "RPCP";
+        public static final String RPCP = RPCP_SOURCE;
 
         /**
          * Tools defined via the RESt API interface dynamically.
diff --git a/Display/src/main/java/me/neurodock/display/Display.java b/Display/src/main/java/me/neurodock/display/Display.java
index 6f9317c..a37a522 100644
--- a/Display/src/main/java/me/neurodock/display/Display.java
+++ b/Display/src/main/java/me/neurodock/display/Display.java
@@ -5,6 +5,7 @@ import me.neurodock.core.Pair;
 import me.neurodock.core.PrintMessageHandler;
 import me.neurodock.core.files.FileHandlerLocation;
 import me.neurodock.core.memory.CoreMemory;
+import me.neurodock.genius.GeniusTools;
 import me.neurodock.ollama.*;
 import me.neurodock.ollama.utils.SystemMessage;
 import org.json.JSONObject;
@@ -169,7 +170,7 @@ public class Display {
                     writeLog("User: " + message);
                     core.getOllamaObject().addMessage(new OllamaMessage(OllamaMessageRole.USER, message.toString()));
                     //System.out.println(ollamaObject.toString());
-                    core.qurryOllama().thenAccept(core::handleResponse);
+                    core.qurryOllama().thenAccept(core::handleResponse).join();
                 }
             }
         } catch (Exception e) {
diff --git a/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java
index eca84dc..ba13869 100644
--- a/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java
+++ b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java
@@ -66,7 +66,7 @@ public class GeniusTools {
 
         OllamaFunctionTools.OllamaFunctionToolsBuilder builder = new OllamaFunctionTools.OllamaFunctionToolsBuilder();
 
-        try(ScanResult scanResult = new ClassGraph().enableAllInfo().acceptPackages("me.zacharias.neuro.dock.genius.endpoints").scan()) {
+        try(ScanResult scanResult = new ClassGraph().enableAllInfo().acceptPackages("me.neurodock.genius.endpoints").scan()) {
             ClassInfoList endpoints = scanResult.getClassesWithAnnotation(GeniusEndpoint.class.getName());
             for (ClassInfo classInfo : endpoints) {
                 Class<?> clazz = classInfo.loadClass();
diff --git a/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java b/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java
index 108aa10..627589e 100644
--- a/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java
+++ b/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java
@@ -9,6 +9,7 @@ public abstract class Tool {
     /**
      * Magic constant for RPCP sources.<br>
      * This is solely here to replace the case of a magic string being used in the code
+     * And is the same as Sources.RPCP from NeuroDock::Core
      */
     public static final String RPCP_SOURCE = "RPCP";