diff --git a/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
index 4d1b9e14e21804f1e44f1a2fd6456da37a113c03..c57c2c2da39ca53ce97d27b498e69b648a16f25a 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/diskmemory/EntityQueryProcessor.h
@@ -19,11 +19,14 @@ namespace armarx::armem::d_ltm::query_proc
         using Base = BaseQueryProcessor<d_ltm::Entity, armem::query::data::EntityQuery>;
 
     public:
+
         EntityQueryProcessor() :
             Base()
         {}
 
+
     private:
+
         void addResultSnapshot(d_ltm::Entity& result, d_ltm::Entity::ContainerT::const_iterator it) const override
         {
             addResultSnapshot(result, it->second);
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
index 708157ab602884f8fd35ee3d78019924fded2c4d..933f9a6fd628b8c2747c2c6449499e596593935b 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/BaseQueryProcessor.h
@@ -23,6 +23,7 @@ namespace armarx::armem::wm::query_proc
             dataMode(dataMode)
         {}
 
+
     protected:
 
         DataMode dataMode;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
index 52efc9cc4930c9c50fb4b2fdc26986e4183ff3e4..692f15aed1831238ed26d77891bbd1047d30d8ba 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.cpp
@@ -6,8 +6,14 @@
 namespace armarx::armem::wm::query_proc
 {
 
+    CoreSegmentQueryProcessor::CoreSegmentQueryProcessor(DataMode dataMode) :
+        Base(dataMode), providerSegmentProcessor(dataMode)
+    {}
+
+
     CoreSegmentQueryProcessor::~CoreSegmentQueryProcessor() = default;
 
+
     data::CoreSegment CoreSegmentQueryProcessor::processToIce(const armem::query::data::CoreSegmentQuery& query, const wm::CoreSegment& coreSegment) const
     {
         data::CoreSegment data;
@@ -15,7 +21,8 @@ namespace armarx::armem::wm::query_proc
         return data;
     }
 
-    ProviderSegment CoreSegmentQueryProcessor::providerSegmentProcessorProcess(const armem::query::data::ProviderSegmentQuerySeq& q, const ProviderSegmentT& s) const
+
+    ProviderSegment CoreSegmentQueryProcessor::providerSegmentProcessorProcess(const armem::query::data::ProviderSegmentQuerySeq& q, const ProviderSegment& s) const
     {
         return providerSegmentProcessor.process(q, s, {armem::query::data::QueryTarget::WM});
     }
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
index 50387e5f1e8d7be59a1e7e2ce038610458420875..8fc7e8a37a6130319529cd64310088cabc6bb2c3 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/CoreSegmentQueryProcessor.h
@@ -22,12 +22,12 @@ namespace armarx::armem::wm::query_proc
 
     public:
 
-        CoreSegmentQueryProcessor(DataMode dataMode = DataMode::WithData) :
-            Base(dataMode), providerSegmentProcessor(dataMode)
-        {}
+        CoreSegmentQueryProcessor(DataMode dataMode = DataMode::WithData);
         virtual ~CoreSegmentQueryProcessor() override;
 
         using Base::process;
+
+
         data::CoreSegment processToIce(const armem::query::data::CoreSegmentQuery& query, const wm::CoreSegment& coreSegment) const;
 
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
index 001bedae13b13b671252c94540a127402d002465..7ef31f2badfbffbf49f132c855b2143b8ddc10bd 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.cpp
@@ -1,11 +1,14 @@
 #include "EntityQueryProcessor.h"
 
-#include <RobotAPI/libraries/armem/core/workingmemory/Entity.h>
 #include <RobotAPI/libraries/armem/core/workingmemory/ice_conversions.h>
 
 
 namespace armarx::armem::wm::query_proc
 {
+    EntityQueryProcessor::EntityQueryProcessor(DataMode dataMode) :
+        Base(dataMode)
+    {}
+
 
     EntityQueryProcessor::~EntityQueryProcessor() = default;
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
index 34f66237e98d5c6f37fb2ea023ca4820b41c53e0..dde53a8ff3393dde385ccc49aa937fcf196476d0 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/EntityQueryProcessor.h
@@ -19,13 +19,12 @@ namespace armarx::armem::wm::query_proc
 
     public:
 
-        EntityQueryProcessor(DataMode dataMode = DataMode::WithData) :
-            Base(dataMode)
-        {}
+        EntityQueryProcessor(DataMode dataMode = DataMode::WithData);
         virtual ~EntityQueryProcessor() override;
 
         data::Entity processToIce(const armem::query::data::EntityQuery& query, const wm::Entity& entity) const;
 
+
     private:
 
         void addResultSnapshot(wm::Entity& result, wm::Entity::ContainerT::const_iterator it) const override;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
index cb8d94789d2cccd67ecb715fda4913daebe655cc..dd249b61caaacaca11e369b19b8f4e0da1dc5cf5 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.cpp
@@ -3,8 +3,20 @@
 
 namespace armarx::armem::wm::query_proc
 {
-    CoreSegment MemoryQueryProcessor::coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegmentT& s) const
+
+    MemoryQueryProcessor::MemoryQueryProcessor(DataMode dataMode) :
+        Base(dataMode), coreSegmentProcessor(dataMode)
+    {}
+
+
+    MemoryQueryProcessor::~MemoryQueryProcessor()
+    {
+    }
+
+
+    CoreSegment MemoryQueryProcessor::coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const
     {
         return coreSegmentProcessor.process(q, s, {armem::query::data::QueryTarget::WM});
     }
+
 }
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
index 674b9ede6b3bb795ae65b00bfc1d220d8f970ed7..c57eea94a464a2e2191e614b5f1d6095d716405a 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/MemoryQueryProcessor.h
@@ -21,14 +21,14 @@ namespace armarx::armem::wm::query_proc
 
     public:
 
-        MemoryQueryProcessor(DataMode dataMode = DataMode::WithData) :
-            Base(dataMode), coreSegmentProcessor(dataMode)
-        {}
+        MemoryQueryProcessor(DataMode dataMode = DataMode::WithData);
+        virtual ~MemoryQueryProcessor() override;
 
 
     protected:
 
-        virtual CoreSegment coreSegmentProcessorProcess(const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const override;
+        virtual CoreSegment coreSegmentProcessorProcess(
+            const armem::query::data::CoreSegmentQuerySeq& q, const CoreSegment& s) const override;
 
 
     private:
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
index 84189bf2ba08d706e623fb065de7063500312b86..a5e23184fa999dc44d72de7588cf77fad0503729 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.cpp
@@ -6,6 +6,11 @@
 namespace armarx::armem::wm::query_proc
 {
 
+    ProviderSegmentQueryProcessor::ProviderSegmentQueryProcessor(DataMode dataMode) :
+        Base(dataMode), entityProcessor(dataMode)
+    {}
+
+
     ProviderSegmentQueryProcessor::~ProviderSegmentQueryProcessor() = default;
 
 
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
index adb921d0211430e818b6aa5e6ce6e62a70acdad8..8e4f5a5e85d6c3c7f58433a0c2ddcd50074c7d7e 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/workingmemory/ProviderSegmentQueryProcessor.h
@@ -20,9 +20,7 @@ namespace armarx::armem::wm::query_proc
 
     public:
 
-        ProviderSegmentQueryProcessor(DataMode dataMode = DataMode::WithData) :
-            Base(dataMode), entityProcessor(dataMode)
-        {}
+        ProviderSegmentQueryProcessor(DataMode dataMode = DataMode::WithData);
         virtual ~ProviderSegmentQueryProcessor() override;