diff --git a/cyber/tools/CMakeLists.txt b/cyber/tools/CMakeLists.txt
index cd2ba11..30e1011 100644
--- a/cyber/tools/CMakeLists.txt
+++ b/cyber/tools/CMakeLists.txt
@@ -56,6 +56,10 @@ file(COPY
   cyber_service/cyber_service.py
   DESTINATION ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_service/
 )
+file(COPY
+  cyber_tools_auto_complete.bash
+  DESTINATION ${CMAKE_BINARY_DIR}
+)
 
 file(RENAME ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_channel/cyber_channel.py ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_channel/cyber_channel)
 file(RENAME ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_launch/cyber_launch.py ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_launch/cyber_launch)
@@ -67,7 +71,13 @@ install(FILES
   ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_launch/cyber_launch
   ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_node/cyber_node
   ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_service/cyber_service
+  ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_service/cyber_monitor
+  ${CMAKE_BINARY_DIR}/bin/cyber/tools/cyber_service/cyber_recorder
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   DESTINATION bin
 )
-
+install(FILES
+  ${CMAKE_BINARY_DIR}/cyber_tools_auto_complete.bash
+  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+  DESTINATION .
+)
diff --git a/setup.bash.in b/setup.bash.in
index fad9b5e..5078550 100644
--- a/setup.bash.in
+++ b/setup.bash.in
@@ -5,7 +5,7 @@ _SETUP_PATH=$(cd `dirname $BASH_SOURCE[0]`; pwd)
 CYBERRT_PATH=$(dirname "$_SETUP_PATH")
 BUILD_PATH=$_SETUP_PATH
 PATH=$_SETUP_PATH/bin/cyber/tools:$_SETUP_PATH/bin/cyber/mainboard:$PATH
-PYTHONPATH=$_SETUP_PATH/lib/python@Python_VERSION@/site-packages:$PYTHONPATH
+PYTHONPATH=$_SETUP_PATH/lib/python@Python_VERSION@/site-packages:$_SETUP_PATH/lib/python@Python_VERSION@/site-packages/cyber/python/internal:$PYTHONPATH
 LD_LIBRARY_PATH=$_SETUP_PATH/lib:$LD_LIBRARY_PATH
 LIBRARY_PATH=$_SETUP_PATH/lib:$LIBRARY_PATH
 CMAKE_PREFIX_PATH=$_SETUP_PATH:$CMAKE_PREFIX_PATH
@@ -29,6 +29,7 @@ for entry in "${mainboard_path}" \
     "${channel_path}" "${node_path}" \
     "${service_path}" \
     "${launch_path}" \
+    "${bazel_bin_path}" \
     "${visualizer_path}" ; do
     export PATH="${entry}":$PATH
 done
@@ -39,3 +40,5 @@ export GLOG_minloglevel=0
 export sysmo_start=0
 export CYBER_DOMAIN_ID=80
 export CYBER_IP=127.0.0.1
+
+source ${BUILD_PATH}/cyber_tools_auto_complete.bash
diff --git a/setup.zsh.in b/setup.zsh.in
index d41d441..710d38c 100644
--- a/setup.zsh.in
+++ b/setup.zsh.in
@@ -5,7 +5,7 @@ _SETUP_PATH=$(cd `dirname $0`; pwd)
 CYBERRT_PATH=$(dirname "$_SETUP_PATH") # CyberRT Path
 BUILD_PATH=$_SETUP_PATH # build path
 PATH=$_SETUP_PATH/bin/cyber/tools:$_SETUP_PATH/bin/cyber/mainboard:$PATH
-PYTHONPATH=$_SETUP_PATH/lib/python@Python_VERSION@/site-packages:$PYTHONPATH
+PYTHONPATH=$_SETUP_PATH/lib/python@Python_VERSION@/site-packages:$_SETUP_PATH/lib/python@Python_VERSION@/site-packages/cyber/python/internal:$PYTHONPATH
 LD_LIBRARY_PATH=$_SETUP_PATH/lib:$LD_LIBRARY_PATH
 LIBRARY_PATH=$_SETUP_PATH/lib:$LIBRARY_PATH
 CMAKE_PREFIX_PATH=$_SETUP_PATH:$CMAKE_PREFIX_PATH
@@ -30,6 +30,7 @@ for entry in "${mainboard_path}" \
     "${channel_path}" "${node_path}" \
     "${service_path}" \
     "${launch_path}" \
+    "${bazel_bin_path}" \
     "${visualizer_path}" ; do
     export PATH="${entry}":$PATH
 done
@@ -40,3 +41,5 @@ export GLOG_minloglevel=0
 export sysmo_start=0
 export CYBER_DOMAIN_ID=80
 export CYBER_IP=127.0.0.1
+
+source ${BUILD_PATH}/cyber_tools_auto_complete.bash