diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..909302e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "3rd-party/z"]
+	path = 3rd-party/z
+	url = https://github.com/rupa/z.git
+[submodule "3rd-party/complete-alias"]
+	path = 3rd-party/complete-alias
+	url = https://github.com/cykerway/complete-alias.git
diff --git a/bashrc b/bashrc
index c80d268..e1202f3 100644
--- a/bashrc
+++ b/bashrc
@@ -26,6 +26,10 @@ source "${BASEDIR}/_helpers.bash"
 # Source custom libs
 _source_dir_files "${BASEDIR}"/libs
 
+# Source 3rd party libs if they exists
+_source_file_if_exists "${BASEDIR}/3rd-party/complete-alias/complete_alias"
+# _source_file_if_exists "${BASEDIR}/3rd-party/z/z.sh" # FIX: Problème de gestion de la variable PROMPT_COMMAND
+
 # Early customization
 _source_dir_files "${BASEDIR}"/rc.before.d