diff --git a/CSM-TCP-Router.vipb b/CSM-TCP-Router.vipb
index e9a36cb..a239a3e 100644
--- a/CSM-TCP-Router.vipb
+++ b/CSM-TCP-Router.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-05-28 13:01:25" Creator="liyao" Comments="" ID="4eb72ca585b47386ba05af730dda1640">
+<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2025-07-07 13:29:02" Creator="liyao" Comments="" ID="a7bb89d037a6048211d2bae057a81234">
   <Library_General_Settings>
     <Package_File_Name>NEVSTOP_lib_CSM_TCP_Router_Example</Package_File_Name>
-    <Library_Version>2025.5.0.3</Library_Version>
+    <Library_Version>2025.7.0.3</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>src</Library_Source_Folder>
     <Library_Output_Folder>vip</Library_Output_Folder>
@@ -18,9 +18,9 @@
   <Advanced_Settings>
     <Package_Dependencies>
       <Additional_External_Dependencies>jki_lib_tcp_server &gt;=5.0.0.8</Additional_External_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.5.28.833</Additional_External_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.5.27.231431</Additional_External_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.5.19.114210</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.7.2.110437</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2025.6.3.115420</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2025.7.2.105225</Additional_External_Dependencies>
       <Additional_External_Dependencies>nevstop_lib_csm_massdata_parameter_support &gt;=2024.12.31.84154</Additional_External_Dependencies>
       <Additional_External_Dependencies>oglib_error &gt;=4.2.0.23</Additional_External_Dependencies>
       <Additional_External_Dependencies>oglib_time &gt;=4.0.1.3</Additional_External_Dependencies>
@@ -74,8 +74,8 @@
       <Copyright/>
       <Packager>NEVSTOP</Packager>
       <URL>https://github.com/NEVSTOP-LAB/CSM-TCP-Router-App</URL>
-      <Release_Notes>[add] #3 support massdata in TCPRouter
-[fix] #13 use TCP timeout configuration in REP-REQ TCP.vi by default</Release_Notes>
+      <Release_Notes>[update] Use Queue API instead for monitoring global log.
+[fix] Fix a bug in "TCP Safe Read.vi"</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
diff --git a/src/CSM-TCP-Router.lvproj b/src/CSM-TCP-Router.lvproj
index f9ed87e..a4a0e6e 100644
--- a/src/CSM-TCP-Router.lvproj
+++ b/src/CSM-TCP-Router.lvproj
@@ -31,8 +31,6 @@
 				<Item Name="API String Arguments Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/API-String-Arugments-Support/API String Arguments Support.lvlib"/>
 				<Item Name="Build Error Cluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/Build Error Cluster__ogtk.vi"/>
 				<Item Name="Communicable State Machine.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib"/>
-				<Item Name="CSM - System States.vi" Type="VI" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_Documentation/CSM - System States.vi"/>
-				<Item Name="CSM - user.lib Dir.vi" Type="VI" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_Documentation/CSM - user.lib Dir.vi"/>
 				<Item Name="CSM File Logger.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM File Logger.lvlib"/>
 				<Item Name="CSM Loop Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Loop-Support/CSM Loop Support.lvlib"/>
 				<Item Name="CSM MassData Parameter Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/MassData-Parameter/CSM MassData Parameter Support.lvlib"/>
diff --git a/src/Client Console/Client Console.vi b/src/Client Console/Client Console.vi
index 5974b9f..a41b5bb 100644
Binary files a/src/Client Console/Client Console.vi and b/src/Client Console/Client Console.vi differ
diff --git a/src/Server/CSM-TCP-Router(Server).vi b/src/Server/CSM-TCP-Router(Server).vi
index 515d816..c83ca6d 100644
Binary files a/src/Server/CSM-TCP-Router(Server).vi and b/src/Server/CSM-TCP-Router(Server).vi differ
diff --git a/src/_addons/TCP-Router/_support/TCP Safe Read.vi b/src/_addons/TCP-Router/_support/TCP Safe Read.vi
index 9658750..8201e8b 100644
Binary files a/src/_addons/TCP-Router/_support/TCP Safe Read.vi and b/src/_addons/TCP-Router/_support/TCP Safe Read.vi differ