diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 1f9fad1f910f7978419f7258f0b227605b59d31c..0462bbd6732c0f39d579e9cb1786359e21f91cbd 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -3,11 +3,12 @@ set(LIB_NAME armem)
 armarx_component_set_name("${LIB_NAME}")
 armarx_set_target("Library: ${LIB_NAME}")
 
-
 set(LIBS
     ArmarXCoreInterfaces ArmarXCore
     RemoteGui
     aron
+    ${LIBMONGOCXX_LIBRARIES}
+    ${LIBBSONCXX_LIBRARIES}
 )
 
 set(ARON_FILES
@@ -49,6 +50,13 @@ set(LIB_FILES
     core/longtermMemory/Memory.cpp
     core/longtermMemory/ProviderSegment.cpp
 
+    core/diskMemory/CoreSegment.cpp
+    core/diskMemory/Entity.cpp
+    core/diskMemory/EntityInstance.cpp
+    core/diskMemory/EntitySnapshot.cpp
+    core/diskMemory/Memory.cpp
+    core/diskMemory/ProviderSegment.cpp
+
     core/error/ArMemError.cpp
 
     client/ComponentPlugin.cpp
@@ -120,7 +128,6 @@ set(LIB_HEADERS
     core/workingMemory/detail/MemoryContainer.h
     core/workingMemory/detail/EntityContainer.h
     core/workingMemory/detail/TypedEntityContainer.h
-
     core/workingMemory/ice_conversions.h
     core/workingMemory/CoreSegment.h
     core/workingMemory/Entity.h
@@ -129,10 +136,6 @@ set(LIB_HEADERS
     core/workingMemory/Memory.h
     core/workingMemory/ProviderSegment.h
 
-    core/longtermMemory/detail/MemoryContainer.h
-    core/longtermMemory/detail/EntityContainer.h
-    core/longtermMemory/detail/TypedEntityContainer.h
-
     core/longtermMemory/CoreSegment.h
     core/longtermMemory/Entity.h
     core/longtermMemory/EntityInstance.h
@@ -141,6 +144,14 @@ set(LIB_HEADERS
     core/longtermMemory/ProviderSegment.h
     core/longtermMemory/mongodb/MongoDBConnectionManager.h
 
+    core/diskMemory/detail/TypedEntityContainer.h
+    core/diskMemory/CoreSegment.h
+    core/diskMemory/Entity.h
+    core/diskMemory/EntityInstance.h
+    core/diskMemory/EntitySnapshot.h
+    core/diskMemory/Memory.h
+    core/diskMemory/ProviderSegment.h
+
     client.h
     client/ComponentPlugin.h
     client/Reader.h
@@ -203,5 +214,6 @@ armarx_enable_aron_file_generation_for_target(
 
 add_library(RobotAPI::libraries::armem ALIAS "${LIB_NAME}")
 
+
 # add unit tests
 add_subdirectory(test)