diff --git a/SampleCommunicator/build.gradle b/SampleCommunicator/build.gradle
index 231ff4c..5d82870 100644
--- a/SampleCommunicator/build.gradle
+++ b/SampleCommunicator/build.gradle
@@ -43,10 +43,10 @@ java {
 dependencies {
 
     // SGr dependencies
-    implementation group: 'com.smartgridready', name: 'sgr-commhandler', version: '2.4.2'
-    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-j2mod', version: '1.0.0'
-    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-apachehttp', version: '2.1.1'
-    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-hivemq', version: '2.0.1'
+    implementation group: 'com.smartgridready', name: 'sgr-commhandler', version: '2.5.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-j2mod', version: '1.1.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-apachehttp', version: '2.2.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-hivemq', version: '2.1.0'
 
     // Logging
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17'
@@ -61,7 +61,7 @@ dependencies {
     implementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.18.0'
     implementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0'
 
-    implementation group: 'org.awaitility', name: 'awaitility', version: '4.2.2'
+    implementation group: 'org.awaitility', name: 'awaitility', version: '4.3.0'
 }
 
 test {
diff --git a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/MockModbusClientFactory.java b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/MockModbusClientFactory.java
index 26ee935..85f0f62 100644
--- a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/MockModbusClientFactory.java
+++ b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/MockModbusClientFactory.java
@@ -92,6 +92,18 @@ public GenDriverAPI4Modbus createTcpTransport(String ipAddress, int port)
         return new GenDriverAPI4ModbusMock(returnInteger);
     }
 
+    @Override
+    public GenDriverAPI4Modbus createTcpTransport(String ipAddress, int port, int timeout)
+    {
+        return new GenDriverAPI4ModbusMock(returnInteger);
+    }
+
+    @Override
+    public GenDriverAPI4Modbus createTcpTransport(String ipAddress, int port, int timeout, boolean rtuOverTcp)
+    {
+        return new GenDriverAPI4ModbusMock(returnInteger);
+    }
+
     @Override
     public GenDriverAPI4Modbus createUdpTransport(String ipAddress)
     {