diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index 22c47eea2cd3c2e0121297f6d5b2e88f369ea3a3..0d8bbbc0794b9f78c912b891ebd2d596ce57016a 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -169,4 +169,9 @@ namespace armarx::armem::server
         return processor.process(input, *memory);
     }
 
+    client::QueryResult MemoryToIceAdapter::query(const client::QueryInput& input)
+    {
+        return client::QueryResult::fromIce(query(input.toIce()));
+    }
+
 }
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
index c6c61c6a18af5b8855e9b97b05b5d79cb73d3a49..ac123807142b39e21bb16bdc72157553640a31c1 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.h
@@ -3,7 +3,8 @@
 #include <RobotAPI/interface/armem/server/MemoryInterface.h>
 #include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
 
-#include "../core/Memory.h"
+#include <RobotAPI/libraries/armem/core/Memory.h>
+#include <RobotAPI/libraries/armem/client/Query.h>
 
 
 namespace armarx::armem::server
@@ -43,6 +44,7 @@ namespace armarx::armem::server
         // READING
 
         query::data::Result query(const armem::query::data::Input& input);
+        client::QueryResult query(const client::QueryInput& input);
 
 
     public: