diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..759d999
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "lib/cvmmap-client-cpp"]
+	path = lib/cvmmap-client-cpp
+	url = https://github.com/crosstyan/cvmmap-cpp-client
+[submodule "lib/CLI11"]
+	path = lib/CLI11
+	url = https://github.com/CLIUtils/CLI11
diff --git a/lib/CLI11 b/lib/CLI11
new file mode 160000
index 0000000..b5fc53c
--- /dev/null
+++ b/lib/CLI11
@@ -0,0 +1 @@
+Subproject commit b5fc53c89afc1f2c4fce49c5061d44dddcd41fc4
diff --git a/lib/cvmmap-client-cpp b/lib/cvmmap-client-cpp
new file mode 160000
index 0000000..186c054
--- /dev/null
+++ b/lib/cvmmap-client-cpp
@@ -0,0 +1 @@
+Subproject commit 186c0544b1e5b98d5e30a808c1ba77b025b38295