diff --git a/README.md b/README.md
index 45e22bd..056ec58 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ Rem: The folder [your-local-project-folder]/SampleCommunicator/src/main/resource
     </tr>
     <tr>
         <td><b>Description:</b></td>
-        <td><p>The 'TransportService' is the link to the physical communication interface of the 'Product'. The SGr Core Team provides the EasyModbus Library for Modbus.</p></td>
+        <td><p>The 'TransportService' is the link to the physical communication interface of the 'Product'. The SGr Core Team provides the j2mod-based library for Modbus.</p></td>
     </tr>
     <tr>
         <td valign="top"><b>Responsibilities:</b></td>
@@ -162,14 +162,14 @@ Rem: The folder [your-local-project-folder]/SampleCommunicator/src/main/resource
     <tr>
         <td><b>Library:</b></td>
         <td><p>
-            easymodbus<br />
+            sgr-driver-j2mod<br />
             sgr-driver-apachehttp<br />
             sgr-driver-hivemq</p>
         </td>
     </tr>
     <tr>
         <td><b>SGrProject:</b></td>    
-        <td><p>für Modbus: <a href="https://github.com/SmartgridReady/SGrJavaDrivers/tree/master/EasyModbus">SmartgridReady/SGrJavaDrivers/EasyModbus</a></p>
+        <td><p>für Modbus: <a href="https://github.com/SmartgridReady/SGrJavaDrivers/tree/master/j2mod">SmartgridReady/SGrJavaDrivers/j2mod</a></p>
             <p>für REST: <a href="https://github.com/SmartGridready/SGrJavaDrivers/tree/master/ApacheHttp">SmartgridReady/SGrJavaDrivers/ApacheHttp</a></p>
             <p>für MQTT: <a href="https://github.com/SmartGridready/SGrJavaDrivers/tree/master/HiveMq">SmartgridReady/SGrJavaDrivers/HiveMq</a></p>
         </td>
diff --git a/SampleCommunicator/build.gradle b/SampleCommunicator/build.gradle
index ad197ec..984950e 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.1.0'
-    runtimeOnly group: 'com.smartgridready', name: 'easymodbus', version: '2.1.0'
-    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-apachehttp', version: '2.0.0'
-    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-hivemq', version: '2.0.0'
+    implementation group: 'com.smartgridready', name: 'sgr-commhandler', version: '2.4.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-j2mod', version: '1.0.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-apachehttp', version: '2.1.0'
+    runtimeOnly group: 'com.smartgridready', name: 'sgr-driver-hivemq', version: '2.0.1'
 
     // Logging
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.10'
diff --git a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/RestSampleCommunicator.java b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/RestSampleCommunicator.java
index b2fd4fc..34439a0 100644
--- a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/RestSampleCommunicator.java
+++ b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/RestSampleCommunicator.java
@@ -168,6 +168,12 @@ class RestClientFactory implements GenHttpClientFactory
 
     @Override
     public GenHttpRequest createHttpRequest()
+    {
+        return createHttpRequest(true);
+    }
+
+    @Override
+    public GenHttpRequest createHttpRequest(boolean verifyCertificate)
     {
         return new RestHttpRequest();
     }
diff --git a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/GenDriverAPI4ModbusMock.java b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/GenDriverAPI4ModbusMock.java
index 017bfb0..e380bc7 100644
--- a/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/GenDriverAPI4ModbusMock.java
+++ b/SampleCommunicator/src/main/java/com/smartgridready/communicator/example/helper/GenDriverAPI4ModbusMock.java
@@ -25,6 +25,7 @@
 
 /**
  * Mock for a {@code GenDriverAPI4Modbus}.
+ * Implements deprecated methods, which will be removed in next major version.
  */
 public class GenDriverAPI4ModbusMock implements GenDriverAPI4Modbus
 {
@@ -33,7 +34,7 @@ public class GenDriverAPI4ModbusMock implements GenDriverAPI4Modbus
     private static final int[] REGISTER_FLOAT_VAL = new int[] { 0x0000435c, 0x000051ec };
 
     private final boolean returnInteger;
-    
+
     private boolean isConnected = false;
 
     /**
@@ -47,6 +48,11 @@ public GenDriverAPI4ModbusMock(boolean returnInteger)
         this.returnInteger = returnInteger;
     }
 
+    @Override
+    public void setUnitIdentifier(short unitId) {
+        // not used in this mock
+    }
+
     @Override
     public int[] ReadInputRegisters(int startingAddress, int quantity)
     {
diff --git a/SampleCommunicator/src/main/resources/SGr_01_mmmm_dddd_Shelly_TRV_RestAPILocal_V0.1.xml b/SampleCommunicator/src/main/resources/SGr_01_mmmm_dddd_Shelly_TRV_RestAPILocal_V0.1.xml
index 525f46e..32eda84 100644
--- a/SampleCommunicator/src/main/resources/SGr_01_mmmm_dddd_Shelly_TRV_RestAPILocal_V0.1.xml
+++ b/SampleCommunicator/src/main/resources/SGr_01_mmmm_dddd_Shelly_TRV_RestAPILocal_V0.1.xml
@@ -177,7 +177,7 @@
 									<requestQuery>
 										<parameter>
 											<name>target_t</name>
-											<value>{{value}}</value>
+											<value>[[value]]</value>
 										</parameter>
 									</requestQuery>
 									<responseQuery>
diff --git a/SampleCommunicator/src/main/resources/SGr_02_mmmmm_dddd_WagoTestsystem_MQTT.xml b/SampleCommunicator/src/main/resources/SGr_02_mmmmm_dddd_WagoTestsystem_MQTT.xml
index 4279b7d..e6e7abd 100644
--- a/SampleCommunicator/src/main/resources/SGr_02_mmmmm_dddd_WagoTestsystem_MQTT.xml
+++ b/SampleCommunicator/src/main/resources/SGr_02_mmmmm_dddd_WagoTestsystem_MQTT.xml
@@ -226,7 +226,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuator/anaolgue/voltage_dc_out1</topic>
-                  <template>{ "set": {{value}} }</template>
+                  <template>{ "set": [[value]] }</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuator/analogue/voltage_dc_out1</topic>
@@ -633,7 +633,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out1</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out1</topic>
@@ -678,7 +678,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out2</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out2</topic>
@@ -725,7 +725,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out3</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out3</topic>
@@ -772,7 +772,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out4</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out4</topic>
@@ -819,7 +819,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out5</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out5</topic>
@@ -866,7 +866,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out6</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out6</topic>
@@ -911,7 +911,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out7</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out7</topic>
@@ -958,7 +958,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuators/voltage_dc_out8</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuators/voltage_dc_out8</topic>
@@ -1181,7 +1181,7 @@
                 </readCmdMessage>
                 <writeCmdMessage>
                   <topic>actuator/register_m1_out1</topic>
-                  <template>{{value}}</template>
+                  <template>[[value]]</template>
                 </writeCmdMessage>
                 <inMessage>
                   <topic>actuator/register_m1_out1</topic>