diff --git a/.gitmodules b/.gitmodules
index 95986fa..c4339ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,3 +53,9 @@
 [submodule "external/solanaceae_object_store"]
 	path = external/solanaceae_object_store
 	url = https://github.com/Green-Sky/solanaceae_object_store.git
+[submodule "external/solanaceae_message_serializer"]
+	path = external/solanaceae_message_serializer
+	url = https://github.com/Green-Sky/solanaceae_message_serializer.git
+[submodule "external/solanaceae_message_fragment_store"]
+	path = external/solanaceae_message_fragment_store
+	url = https://github.com/Green-Sky/solanaceae_message_fragment_store.git
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 36a8f1a..559fe96 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -14,6 +14,10 @@ add_subdirectory(./solanaceae_bridge)
 set(SOLANACEAE_OBJECT_STORE_BUILD_TESTING ${SOLANACEAE_ECOSYSTEM_BUILD_TESTING})
 add_subdirectory(./solanaceae_object_store)
 
+add_subdirectory(./solanaceae_message_serializer)
+set(SOLANACEAE_MESSAGE_FRAGMENT_STORE_BUILD_PLUGINS ON)
+add_subdirectory(./solanaceae_message_fragment_store)
+
 add_subdirectory(./toxcore)
 add_subdirectory(./solanaceae_toxcore)
 add_subdirectory(./solanaceae_tox)
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
index 7c28b23..f9f70a0 160000
--- a/external/solanaceae_message3
+++ b/external/solanaceae_message3
@@ -1 +1 @@
-Subproject commit 7c28b232a46ebede9d6f09bc6eafb49bacfa99ea
+Subproject commit f9f70a05b1d248e84198c83abeda3579107d09bb
diff --git a/external/solanaceae_message_fragment_store b/external/solanaceae_message_fragment_store
new file mode 160000
index 0000000..715b7cf
--- /dev/null
+++ b/external/solanaceae_message_fragment_store
@@ -0,0 +1 @@
+Subproject commit 715b7cfa58e82ac3ceb45bb2b4bb726826150dd4
diff --git a/external/solanaceae_message_serializer b/external/solanaceae_message_serializer
new file mode 160000
index 0000000..1409485
--- /dev/null
+++ b/external/solanaceae_message_serializer
@@ -0,0 +1 @@
+Subproject commit 1409485ef1ee4a2bcf38d7f4631f33e8646d8718
diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store
index 4695579..e26959c 160000
--- a/external/solanaceae_object_store
+++ b/external/solanaceae_object_store
@@ -1 +1 @@
-Subproject commit 46955795b034ed4b058958bba620bd8965ce91f7
+Subproject commit e26959c380bc76e8c01a517019c4c0a569156b1d
diff --git a/external/solanaceae_util b/external/solanaceae_util
index bee42d4..2420af4 160000
--- a/external/solanaceae_util
+++ b/external/solanaceae_util
@@ -1 +1 @@
-Subproject commit bee42d4688e873115d578032970f0d5b84c41605
+Subproject commit 2420af464f270afaf07391ab51cc94a8b979e00c