diff --git a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/HasLogger.java b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/HasLogger.java
index 5719b9bd..080eda99 100644
--- a/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/HasLogger.java
+++ b/agrirouter-sdk-java-api/src/main/java/com/dke/data/agrirouter/api/service/HasLogger.java
@@ -1,5 +1,7 @@
 package com.dke.data.agrirouter.api.service;
 
+import static java.lang.String.valueOf;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -8,8 +10,6 @@
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
-import static java.lang.String.valueOf;
-
 /**
  * Interface to encapsulate logging capabilities. Logging will be done using LOG4J2, ruleset should
  * be:
@@ -43,9 +43,7 @@ default Logger getNativeLogger() {
     return loggerCache.get(this.getClass().getName());
   }
 
-  /**
-   * Log method begin. Will log all given parameters as well.
-   */
+  /** Log method begin. Will log all given parameters as well. */
   default void logMethodBegin(Object... objects) {
     getNativeLogger().debug(METHOD_BEGIN, "BEGIN | Start of method.");
     Arrays.stream(objects).forEach(o -> getNativeLogger().trace(valueOf(o)));
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt
deleted file mode 100644
index 83226c21..00000000
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/XsuaaResponse.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dke.data.agrirouter.api.dto.xsuaa
-
-import com.dke.data.agrirouter.api.dto.xsuaa.inner.ExtAttr
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-import com.fasterxml.jackson.annotation.JsonProperty
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-class XsuaaResponse {
-
-    @JsonProperty("access_token")
-    lateinit var accessToken: String
-
-    @JsonProperty("token_type")
-    lateinit var tokenType: String
-
-    @JsonProperty("expires_in")
-    lateinit var expiresIn: String
-
-    lateinit var scope: String
-
-    @JsonProperty("ext_attr")
-    lateinit var extAttr: ExtAttr
-
-
-}
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
deleted file mode 100644
index 3c5d0c25..00000000
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/dto/xsuaa/inner/ExtAttr.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.dke.data.agrirouter.api.dto.xsuaa.inner
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-class ExtAttr {
-    lateinit var enhancer: String
-}
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
index c7c2959d..956c3529 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/ApplicationType.kt
@@ -10,7 +10,7 @@ enum class ApplicationType(val key: String) {
 
     companion object {
         fun of(key: String): Optional<ApplicationType>? {
-            return Arrays.stream(ApplicationType.values()).filter { a -> a.key.contentEquals(key) }.findFirst()
+            return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst()
         }
     }
 
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
index 3f3946ac..a2c822da 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Direction.kt
@@ -1,5 +1,6 @@
 package com.dke.data.agrirouter.api.enums
 
+@Suppress("unused")
 enum class Direction(val key: Int) {
 
     SEND(0),
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
index a1b67deb..bd52cae1 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/EncodingType.kt
@@ -1,5 +1,6 @@
 package com.dke.data.agrirouter.api.enums
 
+@Suppress("unused")
 enum class EncodingType(var key: String) {
     BASE_64("base64");
 }
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
index 9f7fb2df..a12ff046 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Gateway.kt
@@ -2,6 +2,7 @@ package com.dke.data.agrirouter.api.enums
 
 import java.util.*
 
+@Suppress("unused")
 enum class Gateway(val key: String) {
 
     REST("3"),
@@ -10,7 +11,7 @@ enum class Gateway(val key: String) {
 
     companion object {
         fun of(key: String): Optional<Gateway>? {
-            return Arrays.stream(Gateway.values()).filter { a -> a.key.contentEquals(key) }.findFirst()
+            return Arrays.stream(values()).filter { a -> a.key.contentEquals(key) }.findFirst()
         }
     }
 
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
index 72087df9..d6fd8560 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/enums/Mode.kt
@@ -1,5 +1,6 @@
 package com.dke.data.agrirouter.api.enums
 
+@Suppress("unused")
 enum class Mode(val key: String) {
 
     ZERO("0")
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
index 6e89233a..3b5d5cef 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/AuthorizationRequestParameters.kt
@@ -9,7 +9,7 @@ import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase
  */
 class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidation {
 
-    var applicationId : String = ""
+    var applicationId: String = ""
 
     var redirectUri: String = ""
 
@@ -18,7 +18,7 @@ class AuthorizationRequestParameters : AbstractParameterBase(), ParameterValidat
     var responseType: SecuredOnboardingResponseType = SecuredOnboardingResponseType.ONBOARD
 
     override fun technicalValidation() {
-        isBlank("applicationId",applicationId)
+        isBlank("applicationId", applicationId)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
index 250afc43..46662160 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOffboardingParameters.kt
@@ -14,12 +14,12 @@ class CloudOffboardingParameters : AbstractParameterBase(), ParameterValidation
     var endpointIds: List<String>? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        nullCheck("endpointIds",endpointIds)
+        nullCheck("onboardingResponse", onboardingResponse)
+        nullCheck("endpointIds", endpointIds)
     }
 
     override fun businessValidation() {
-        nullOrEmpty("endpointIds",endpointIds)
+        nullOrEmpty("endpointIds", endpointIds)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
index 6be3305a..323c57f3 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/CloudOnboardingParameters.kt
@@ -14,12 +14,12 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation {
     var endpointDetails: List<EndpointDetailsParameters>? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        nullCheck("endpointDetails",endpointDetails)
+        nullCheck("onboardingResponse", onboardingResponse)
+        nullCheck("endpointDetails", endpointDetails)
     }
 
     override fun businessValidation() {
-        nullOrEmpty("endpointDetails",endpointDetails)
+        nullOrEmpty("endpointDetails", endpointDetails)
         endpointDetails?.forEach {
             it.validate()
         }
@@ -32,8 +32,8 @@ class CloudOnboardingParameters : AbstractParameterBase(), ParameterValidation {
         var endpointName: String? = null
 
         override fun technicalValidation() {
-            isBlank("endpointId",endpointId)
-            isBlank("endpointName",endpointName)
+            isBlank("endpointId", endpointId)
+            isBlank("endpointName", endpointName)
         }
 
     }
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
index 911d61a4..632388f8 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/FetchMessageParameters.kt
@@ -12,7 +12,7 @@ open class FetchMessageParameters : AbstractParameterBase(), ParameterValidation
     var onboardingResponse: OnboardingResponse? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
+        nullCheck("onboardingResponse", onboardingResponse)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
index a6731d23..d7e25b80 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/ListEndpointsParameters.kt
@@ -10,7 +10,6 @@ import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase
  */
 class ListEndpointsParameters : AbstractParameterBase(), ParameterValidation {
 
-
     var onboardingResponse: OnboardingResponse? = null
 
     var technicalMessageType: TechnicalMessageType? = null
@@ -20,9 +19,9 @@ class ListEndpointsParameters : AbstractParameterBase(), ParameterValidation {
     var unfilteredList: Boolean = false
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        nullCheck("technicalMessageType",technicalMessageType)
-        nullCheck("direction",direction)
+        nullCheck("onboardingResponse", onboardingResponse)
+        nullCheck("technicalMessageType", technicalMessageType)
+        nullCheck("direction", direction)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
index 37c82538..a5061be0 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationForAllPendingMessagesParameters.kt
@@ -12,7 +12,7 @@ class MessageConfirmationForAllPendingMessagesParameters : AbstractParameterBase
     var onboardingResponse: OnboardingResponse? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
+        nullCheck("onboardingResponse", onboardingResponse)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
index 88502407..fd139840 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageConfirmationParameters.kt
@@ -14,8 +14,8 @@ class MessageConfirmationParameters : AbstractParameterBase(), ParameterValidati
     var messageIds: List<String>? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        nullCheck("messageIds",messageIds)
+        nullCheck("onboardingResponse", onboardingResponse)
+        nullCheck("messageIds", messageIds)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
index 47cd46bb..a93265c9 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/MessageHeaderParameters.kt
@@ -29,15 +29,16 @@ class MessageHeaderParameters : ParameterValidation {
     var metadata: MessageOuterClass.Metadata? = null
 
     override fun technicalValidation() {
-        isBlank("applicationMessageId",applicationMessageId)
-        nullCheck("technicalMessageType",technicalMessageType)
-        nullCheck("mode",mode)
+        isBlank("applicationMessageId", applicationMessageId)
+        nullCheck("technicalMessageType", technicalMessageType)
+        nullCheck("mode", mode)
     }
 
     /**
      * Copy the content of the message header parameters into this class.
      */
     fun copy(messageHeaderParameters: MessageHeaderParameters) {
+        messageHeaderParameters.validate()
         applicationMessageId = messageHeaderParameters.applicationMessageId
         applicationMessageSeqNo = messageHeaderParameters.applicationMessageSeqNo
         technicalMessageType = messageHeaderParameters.technicalMessageType
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
index 58aa8a04..58003ecc 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/OnboardingParameters.kt
@@ -25,12 +25,13 @@ class OnboardingParameters : AbstractParameterBase(), ParameterValidation {
     var registrationCode: String? = null
 
     override fun technicalValidation() {
-        isBlank("applicationId",applicationId)
-        isBlank("uuid",uuid)
-        isBlank("certificationVersionId",certificationVersionId)
-        isBlank("gatewayId",gatewayId)
-        nullCheck("certificationType",certificationType)
-        nullCheck("applicationType",applicationType)
-        isBlank("registrationCode",registrationCode)
+        isBlank("applicationId", applicationId)
+        isBlank("uuid", uuid)
+        isBlank("certificationVersionId", certificationVersionId)
+        isBlank("gatewayId", gatewayId)
+        nullCheck("certificationType", certificationType)
+        nullCheck("applicationType", applicationType)
+        isBlank("registrationCode", registrationCode)
     }
+
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
index 093cac6d..88498160 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/PayloadParameters.kt
@@ -25,8 +25,8 @@ class PayloadParameters : AbstractParameterBase(), ParameterValidation {
     var value: ByteString? = null
 
     override fun technicalValidation() {
-        nullCheck("typeUrl",typeUrl)
-        nullCheck("value",value)
+        nullCheck("typeUrl", typeUrl)
+        nullCheck("value", value)
     }
 
     /**
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt
deleted file mode 100644
index e6b45b7c..00000000
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RegistrationCodeRequestParameters.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.dke.data.agrirouter.api.service.parameters
-
-import com.dke.data.agrirouter.api.service.ParameterValidation
-import com.dke.data.agrirouter.api.service.parameters.base.AbstractParameterBase
-
-/**
- * Parameters class. Encapsulation for the services.
- */
-class RegistrationCodeRequestParameters : AbstractParameterBase(), ParameterValidation {
-
-    lateinit var applicationId: String
-
-    override fun technicalValidation() {
-        isBlank("applicationId",applicationId)
-    }
-
-
-
-}
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
index 468e8e62..eb81877a 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/RevokeParameters.kt
@@ -18,14 +18,15 @@ class RevokeParameters : ParameterValidation {
     var publicKey: String? = null
 
     override fun technicalValidation() {
-        isBlank("applicationId",applicationId)
-        isBlank("accountId",accountId)
-        isBlank("privateKey",privateKey)
-        isBlank("publicKey",publicKey)
-        nullCheck("endpointIds",endpointIds)
+        isBlank("applicationId", applicationId)
+        isBlank("accountId", accountId)
+        isBlank("privateKey", privateKey)
+        isBlank("publicKey", publicKey)
+        nullCheck("endpointIds", endpointIds)
     }
 
     override fun businessValidation() {
-        nullOrEmpty("endpointIds",endpointIds)
+        nullOrEmpty("endpointIds", endpointIds)
     }
+
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
index 1c711345..b4441203 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SecuredOnboardingParameters.kt
@@ -26,14 +26,14 @@ class SecuredOnboardingParameters : AbstractParameterBase(), ParameterValidation
     var registrationCode: String? = null
 
     override fun technicalValidation() {
-        isBlank("applicationId",applicationId)
-        isBlank("privateKey",privateKey)
-        isBlank("publicKey",publicKey)
-        isBlank("uuid",uuid)
-        isBlank("certificationVersionId",certificationVersionId)
-        isBlank("gatewayId",gatewayId)
-        isBlank("registrationCode",registrationCode)
-        nullCheck("certificationType",certificationType)
+        isBlank("applicationId", applicationId)
+        isBlank("privateKey", privateKey)
+        isBlank("publicKey", publicKey)
+        isBlank("uuid", uuid)
+        isBlank("certificationVersionId", certificationVersionId)
+        isBlank("gatewayId", gatewayId)
+        isBlank("registrationCode", registrationCode)
+        nullCheck("certificationType", certificationType)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
index 4d4deeaa..30ca0226 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SendMessageParameters.kt
@@ -14,12 +14,12 @@ open class SendMessageParameters : AbstractParameterBase(), ParameterValidation
     var encodedMessages: List<String>? = null
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        nullCheck("encodedMessages",encodedMessages)
+        nullCheck("onboardingResponse", onboardingResponse)
+        nullCheck("encodedMessages", encodedMessages)
     }
 
     override fun businessValidation() {
-        nullOrEmpty("encodedMessages",encodedMessages)
+        nullOrEmpty("encodedMessages", encodedMessages)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
index d7a7e478..0855def7 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetCapabilitiesParameters.kt
@@ -28,17 +28,17 @@ class SetCapabilitiesParameters : AbstractParameterBase(), ParameterValidation {
         var direction: Capabilities.CapabilitySpecification.Direction? = null
 
         override fun technicalValidation() {
-            nullCheck("technicalMessageType",technicalMessageType)
-            nullCheck("direction",direction)
+            nullCheck("technicalMessageType", technicalMessageType)
+            nullCheck("direction", direction)
         }
 
     }
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
-        isBlank("applicationId",applicationId)
-        isBlank("certificationVersionId",certificationVersionId)
-        nullCheck("capabilitiesParameters",capabilitiesParameters)
+        nullCheck("onboardingResponse", onboardingResponse)
+        isBlank("applicationId", applicationId)
+        isBlank("certificationVersionId", certificationVersionId)
+        nullCheck("capabilitiesParameters", capabilitiesParameters)
         capabilitiesParameters?.forEach { c -> c.validate() }
     }
 
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
index 6663da44..f2a27796 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/SetSubscriptionParameters.kt
@@ -21,14 +21,15 @@ class SetSubscriptionParameters : AbstractParameterBase(), ParameterValidation {
         var position: Boolean = false
 
         override fun technicalValidation() {
-            nullCheck("technicalMessageType",technicalMessageType)
+            nullCheck("technicalMessageType", technicalMessageType)
         }
+
     }
 
     var subscriptions: List<Subscription> = ArrayList()
 
     override fun technicalValidation() {
-        nullCheck("onboardingResponse",onboardingResponse)
+        nullCheck("onboardingResponse", onboardingResponse)
     }
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
index 32f9b4ae..ec100702 100644
--- a/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
+++ b/agrirouter-sdk-java-api/src/main/kotlin/com/dke/data/agrirouter/api/service/parameters/base/AbstractParameterBase.kt
@@ -1,11 +1,11 @@
 package com.dke.data.agrirouter.api.service.parameters.base
 
-open class AbstractParameterBase : DynamicAttributesStorage() {
+abstract class AbstractParameterBase : DynamicAttributesStorage() {
 
-    var applicationMessageId : String? = null
+    var applicationMessageId: String? = null
 
-    var teamsetContextId : String? = null
+    var teamsetContextId: String? = null
 
-    var sequenceNumber : Int = 1
+    var sequenceNumber: Int = 1
 
 }
\ No newline at end of file
diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
index 5c0b7938..05f0d86f 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/MessageBodyCreator.java
@@ -8,6 +8,7 @@
 import com.google.gson.GsonBuilder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public interface MessageBodyCreator {
 
@@ -15,20 +16,18 @@ default String createMessageBody(SendMessageParameters parameters) {
     parameters.validate();
     GsonBuilder gsonBuilder = new GsonBuilder();
     gsonBuilder.registerTypeAdapter(Message.class, new MessageTypeAdapter());
-    String json = gsonBuilder.create().toJson(this.createSendMessageRequest(parameters));
-    return json;
+    return gsonBuilder.create().toJson(this.createSendMessageRequest(parameters));
   }
 
   default SendMessageRequest createSendMessageRequest(SendMessageParameters parameters) {
     parameters.validate();
     SendMessageRequest sendMessageRequest = new SendMessageRequest();
     sendMessageRequest.setSensorAlternateId(
-        parameters.getOnboardingResponse().getSensorAlternateId());
+        Objects.requireNonNull(parameters.getOnboardingResponse()).getSensorAlternateId());
     sendMessageRequest.setCapabilityAlternateId(
         parameters.getOnboardingResponse().getCapabilityAlternateId());
     List<Message> messages = new ArrayList<>();
-    parameters
-        .getEncodedMessages()
+    Objects.requireNonNull(parameters.getEncodedMessages())
         .forEach(
             messageToSend -> {
               Message message = new Message();
diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
index fec48ad2..846e50da 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/messaging/helper/mqtt/MessageQueryHelperService.java
@@ -10,6 +10,7 @@
 import com.dke.data.agrirouter.impl.messaging.MqttService;
 import com.dke.data.agrirouter.impl.messaging.rest.MessageSender;
 import java.util.Collections;
+import java.util.Objects;
 import org.eclipse.paho.client.mqttv3.IMqttClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -51,7 +52,9 @@ public String send(MessageQueryParameters parameters) {
       byte[] payload = messageAsJson.getBytes();
       this.getMqttClient()
           .publish(
-              parameters.getOnboardingResponse().getConnectionCriteria().getMeasures(),
+              Objects.requireNonNull(parameters.getOnboardingResponse())
+                  .getConnectionCriteria()
+                  .getMeasures(),
               new MqttMessage(payload));
       return encodedMessage.getApplicationMessageID();
     } catch (MqttException e) {
diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
index e83bb4d7..d04e2cf6 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/OnboardingServiceImpl.java
@@ -9,6 +9,7 @@
 import com.dke.data.agrirouter.api.service.parameters.OnboardingParameters;
 import com.dke.data.agrirouter.impl.RequestFactory;
 import com.dke.data.agrirouter.impl.validation.ResponseValidator;
+import java.util.Objects;
 import java.util.Optional;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Response;
@@ -48,7 +49,7 @@ private OnboardingRequest createOnboardingRequestBody(OnboardingParameters param
             parameters.getApplicationId(),
             parameters.getCertificationVersionId(),
             parameters.getGatewayId(),
-            parameters.getCertificationType());
+            Objects.requireNonNull(parameters.getCertificationType()));
     this.getNativeLogger().info("END | Create onboarding request. | '{}'.", parameters);
     return onboardRequest;
   }
diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
index 38a7a514..b9d916ce 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/onboard/secured/OnboardingServiceImpl.java
@@ -21,6 +21,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.Signature;
 import java.security.SignatureException;
+import java.util.Objects;
 import java.util.Optional;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.MediaType;
@@ -63,7 +64,7 @@ private OnboardingRequest createOnboardingRequestBody(SecuredOnboardingParameter
         parameters.getApplicationId(),
         parameters.getCertificationVersionId(),
         parameters.getGatewayId(),
-        parameters.getCertificationType());
+        Objects.requireNonNull(parameters.getCertificationType()));
   }
 
   private OnboardingResponse onboard(
diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
index f78f9d27..9eb5de01 100644
--- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
+++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/revoke/RevokingServiceImpl.java
@@ -12,6 +12,7 @@
 import com.dke.data.agrirouter.impl.SignatureService;
 import com.dke.data.agrirouter.impl.common.UtcTimeService;
 import com.google.gson.Gson;
+import java.util.Objects;
 import java.util.Optional;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.MediaType;
@@ -45,7 +46,7 @@ public RevokeResponse revoke(RevokeParameters revokeParameters) {
 
       response.bufferEntity();
       RevokeResponse result = RevokeResponse.Filter.valueOf(response.getStatus());
-      if (result.getKey() == RevokeResponse.SUCCESS.getKey()) {
+      if (Objects.requireNonNull(result).getKey() == RevokeResponse.SUCCESS.getKey()) {
         return result;
       } else {
         throw new RevokingException(getLastRevokingError(response.readEntity(String.class)));
@@ -59,15 +60,15 @@ public RevokeResponse revoke(RevokeParameters revokeParameters) {
 
   private String createSignature(RevokeParameters revokeParameters, String jsonBody) {
     byte[] signature = this.createSignature(jsonBody, revokeParameters.getPrivateKey());
-    String encodedSignature = Hex.encodeHexString(signature);
-    return encodedSignature;
+    return Hex.encodeHexString(signature);
   }
 
   private RevokeRequest createRevokeRequestBody(RevokeParameters parameters) {
     this.getNativeLogger().info("BEGIN | Create revoking request. | '{}'.", parameters);
     RevokeRequest revokeRequest = new RevokeRequest();
-    revokeRequest.setAccountId(parameters.getAccountId());
-    revokeRequest.setEndpointIds(parameters.getEndpointIds().toArray(new String[] {}));
+    revokeRequest.setAccountId(Objects.requireNonNull(parameters.getAccountId()));
+    revokeRequest.setEndpointIds(
+        Objects.requireNonNull(parameters.getEndpointIds()).toArray(new String[] {}));
     revokeRequest.setUTCTimestamp(UtcTimeService.inThePast(10).toString());
     revokeRequest.setTimeZone(UtcTimeService.offset());
     this.getNativeLogger().info("END | Create revoking request. | '{}'.", parameters);
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json b/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json
new file mode 100644
index 00000000..1d271fc7
--- /dev/null
+++ b/agrirouter-sdk-java-tests/onboarding-responses/communication-unit.json
@@ -0,0 +1 @@
+{"deviceAlternateId":"2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"59c3c127-da76-437e-94df-067a0ae3275b","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/2f4ca9a8-3a9d-42fc-ae75-4d3fdb5e173c"},"authentication":{"type":"P12","secret":"828v3rR8GMYLOHp2e0kXTb!U3Y0RL3yI?Xk#","certificate":"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\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json
index f3ff1126..df43fe4b 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "8bf7c94a-94e3-49ba-9721-a4c33aaed116",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "2dec1652-ba80-4a82-90fe-07c404d4eef3",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/8bf7c94a-94e3-49ba-9721-a4c33aaed116",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/8bf7c94a-94e3-49ba-9721-a4c33aaed116"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "vvIv98PrFtpHcjw95xAKSnTsygGyqqExW9AD",
-    "certificate": "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\u003d\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"37a01d7e-1d80-41bf-b75f-3c8410117e14","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"fa79811e-8d8b-4763-bb6c-62d3566dea7b","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/37a01d7e-1d80-41bf-b75f-3c8410117e14","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/37a01d7e-1d80-41bf-b75f-3c8410117e14"},"authentication":{"type":"P12","secret":"LrM#5jUhOkG61cvK5XhuOogU6R8NfrO?QtzJ","certificate":"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\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json
index e491e8ce..07c9aef9 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-removed.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "79cdfa9a-e31d-4cdd-8083-24ca35ac6024",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "935bc83b-ba14-46bd-92b0-6c02077aeea1",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/79cdfa9a-e31d-4cdd-8083-24ca35ac6024",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/79cdfa9a-e31d-4cdd-8083-24ca35ac6024"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "4fef44ZHZYgl4RoZTizf73QIsJViPAXlHfvI",
-    "certificate": "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\u003d\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"530d0594-e7e0-45b5-80f2-c1202d03286d","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"63e29503-68a9-4779-9501-12411321dcd6","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/530d0594-e7e0-45b5-80f2-c1202d03286d","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/530d0594-e7e0-45b5-80f2-c1202d03286d"},"authentication":{"type":"P12","secret":"xlHg?EeLuaRHk3TyIKfWO?gH6!8OPvBs9LDb","certificate":"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\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json
index 77720d7a..fbf57686 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "0ae931fd-cb7e-4bf8-aaa2-7e852ed1ed28",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "98ac4171-c479-44f0-86c2-5b0f70650ecf",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/0ae931fd-cb7e-4bf8-aaa2-7e852ed1ed28",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/0ae931fd-cb7e-4bf8-aaa2-7e852ed1ed28"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "gKkjrXZ8QeE8casv7ZP55gNyN7QNmcrNPUdD",
-    "certificate": "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\u003d\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"b2e2e9c8-eb4e-4dd8-940c-afd1d563f2cd","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"e0f1dd95-8282-46e0-923c-22df27fc956d","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/b2e2e9c8-eb4e-4dd8-940c-afd1d563f2cd","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/b2e2e9c8-eb4e-4dd8-940c-afd1d563f2cd"},"authentication":{"type":"P12","secret":"j#WUN4WIueOamKtCicYGckmTagm62GMh6?mS","certificate":"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\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json
index 0f13a0f1..1524a02e 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-deactivated.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "5f1e84fa-26d8-4b83-b8e9-3396aff75650",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "38a03588-cfd9-4758-85b6-bea388aa7059",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/5f1e84fa-26d8-4b83-b8e9-3396aff75650",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/5f1e84fa-26d8-4b83-b8e9-3396aff75650"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "hYdXVjl9rqLG4owZ8kyx1bg3hRIdekeMhSyx",
-    "certificate": "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\u003d\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"c7f5e542-fc4a-4435-af1f-febfaa6803dd","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"4da67111-7c70-494c-b1d6-0a3f1e4d404e","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/c7f5e542-fc4a-4435-af1f-febfaa6803dd","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/c7f5e542-fc4a-4435-af1f-febfaa6803dd"},"authentication":{"type":"P12","secret":"DLDsvDa?VBsX4EAKZAa2j4N2YUwJP139wWCV","certificate":"MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCBAAwgDCABgkqhkiG9w0BBwGggCSABIIEADCCBRowggUWBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQINpp7tIGldYQCAgfQBIIEyOByihiGnSbScpB8zyggt8fJTiPK260sWRV9j129kbpx/DZDc8AsUr2JJxTEyG8Vw5mELFzDIElSuFN49X0ZZclOTBdP/BIWB09jT3P16uVgSu58QECtGB0E/yOB9lwdRec1jQ/uh/0E33fPb3zErlQkXPdjVsvlZSx7PxTfGWhjEB95ueV7M4rOTLApx723cCms7nTuriDfwIzeE+7rAkVY5Uum9jbYsb8yHqf0FghSvCmgjF1ijwE48hzktcZJat7Vte8AXV9s2keEUGCOMJXhBa0nt7zBo2HCKbgY8QJ5tmPM5+2rHD9mpXNyF/OD/02pM0BUYgk2gpf5Mj8weZxkawNWeBs1Ec/gsIgaX3bvBEsOGNg51up4Xm8SsJxLEQkVs0rvAt1oMZaeiU/dcX33uLaXLY35HYGp6E1GzgAx+c1Pso6gUoQWmnFcy0qxXEZLd/TFl6PwKl23kZ2ZjUyMNVJp5/KwB1xLHlYw7/XPBhGXQPSgdH84zTeUabYgEcOKHW/tw15PHqeVv16wJvvDcTLNKKLkvt0wTkQ9Xa3m7HvtUrfE8A2UT+cuMJz8F5AXY1YW73qmtGenLt2F6PgRJ319kub0GDJUx4k7Odz/rrbXiOdG7eF5LRSARXXacEfRAIplCQErW1MFEwK7j4nQdBDZjRO2Sy6aqW4gfDaZ2v0byTw+g6sMio1nBjQ6T4JECApblKEDtyo6qjTvXyj/AFMGYNCreOGE+VtE37REgloyDhmRLW54x17W8o8ayc0TPG97CDnJbmTWuExYJZkefclXseLc+bALCU6OhV+Msq8ZWc3KUUMHM9x/hO5f2VO7gcBa+hE8w0ezxR9vL3x+8kYHXNuPNdFbMkpBEycGhQ+Wu0/chSDWZljblkOr36UTxxaeO2T7Zaz327gAk4IWcOHFw445bVa/hHhSzdM8dPGHS+KXCztSsY5/zuKjoFipuYtT6AkUS2iMHu6v8D+svrZGe4oKxqjqVNzysR/2Wxveg918dMltpP0T0ywo86W6X/x8xq21bg6xqgtOjLi5M3/VuEUDKUx7mZvCQsKJsDEihbdutUvV4O3gAXfRp1TaBH9XNarSBKGHpf0MDSSDtxhgrLPlm+bNVE2LG1FsLM+6DVGB6TCcIB6Akx5m7VB4/aX7edrY4lcAQmuITjbCiBCWldZW8STzKV2irM+1SUBDic9imWtygMrDCoU9JlR6/DKN3gCdaLCXvD0ujsjY2we+KbCSf7PIBIIEADpPXK042AS+MWQrxhVi07T+1IixpARgBIIBHpRWtOZ26FCuTxUb2ztgs38csue3tCURqJ59auvyBQPiMi/N/NS3Wt/pqhX8xYMfgrIhDVzDOKo03luKYk7K3a52M9SGLL4xZahMmDXjMtaVkjZG1wX7v20FhyZiRfHyUanuS8wriuhklyHIG8cIwuCnpKX/tvDB8+bLPfHJjUKig9+wMQkVBENyP9H1za7lzmzKtF50YrFC1/TaWDaBdMj+iiAw06myKj5TishB8Cz++3r+VDaxgC6nKizSU4exdfoAQzSOgUgYTLBzkvb1o2JeQUCmNRFGSBZbOyzlCdogFOxPh9rPBDofpGoDSaYIhhnX0g/QYZ4oJl/rv8l1k+iBDdNotOqHMRUwEwYJKoZIhvcNAQkVMQYEBAEAAAAAAAAAAAAwgAYJKoZIhvcNAQcGoIAwgAIBADCABgkqhkiG9w0BBwEwHAYKKoZIhvcNAQwBBjAOBAgmzvk+LAQaCgICB9CggASCBLiH+XoApHnIpQ1obakHc6RJVF08Rh57DlvfDjjW7y4byTWFeM4u6U95L15IzjH/KjEpcXBRYlXsqYsM5R4CugAk+qX3KGsCwirRB5vDZq+4LQRXDgJjL7A8rgG0NnYhIPHIOQYF0O9NbjSP9UnEx5ezWRUiPEA4ktKWpqgFm+4dceN23OzMUmsKjSJF3umOytzkzqg7n2NsLlf2l1JKC2manpgxi5bhwqAM/FirWjHTEob2+KrgVh4F6A1AwlQKVAwpW030uX5ssHC/SfpASuAdSHoU5B130fTCq85Ao+VDsqPRFsjRg2oBZU7nNRmIfaNfRZeoVs4KaQbaPMw4hyerJPc4rVmW2NK728A/D8Z72rI9tVRuiN/AuBXrwlupEeFwPQRtrI7p/MUT+E9pn/ncp671+BlIGwv0a+AkSqT9wuNlJQNv7rCH7GE/4P1hNYs8TYbT9fgsQH1wkuWlRrjrdSlmJST/DYC/dIlQLGB0XlG3Nzh0TdUDQGOaufJhFi3QkSruBTo9y0f1K7+N5lwykzuMI1pi2nQkNZJUeaWvzs/588A/TGZKYRCdX8exsHp4sj8lOJCY0PsyoEyVYj5GffmgtwSvoEQs1YISEBNPSVmyjmT5nL9uUftv8P35XpbvcvFWlVPYswqsNjkmE5CXrVuh97QESI7uNO5THn51znv8ZfL4Ieqg4hL8q6NnTB1pxy41hITQFonwDhENuO81Z329E7oLsoroBlcemP+YlSWNdWwXC0vduTsGYWiA55dxxDvCxxYjDibJ7fzuvWD47TQ7MzcyLcGJyH4wtal8Unhm9Y+BMj3FsuvhLRW+UAlfYZVYZSG5WBQVQzkEggJIduDWlmLfKks9r3MejSVIvrPO0zYlvAA7tjcawW6ZW03Pllz1yJv1ku83DUogohR5VIljgBJZiJNmlnA/Qjhy8/cKtYP55/Lx19wQlhRRhNTEzJkLosRgkZlyJfDDnXQPZNRoMQZdgZJ1HTIs8dWUgQM9AGaUHMdUgtCNbCOoDuGm5NfXcSAHSDddaV4AFszJxbbEsjbqLLYFE3PgcgcKf03F4Cs2VrB3ffq+E0aFJPbpIIN9weiVPqmP4vJE5AZps+NJUt1GLAE7PQLDrI9fIoswKe7SDyk/Tm32pOKLEqHg0MijrDzglRjHBgxx4/kJ8eo9AaGKKrfSIFU0ma+4v0N/O+npZwDciQug1bZZt8cqxAoU1LDOBBx17DeZlCi9B9Rb2c7LdvUNA9nDKJiy4LJ7OGRRqxmUOjgdvb+GfknGTODEmSjiIcB+sAf2erHCwD/U3gSnmZifU1UZm71apxPCprHYEC9JqM92DZ8leevJwH8Jo3M2VC43ZbiUrPSm/ymWnFQ98ShnnTZfmUccIYwswT2Inr1ZMyqHe6WyKb10VvjE44rx9BdueAlFHkE2WqsCY0dAURrCwtVm+sgvCjizNCzsP9O+VFltXkXdw2bSdxQ1SZmRXC6ifMpVoNYT0ymGPsA2rRa6ZkftVqI7CsxHiwQk83yAs4iKqwbJpujXcLtCJTEpboZQx5/901aWVA3tN214HaeMcw/E+ie8wDQm9n+SWAdQzzF1SQirsIUKnwX4vuS4lZRZqYgAAAAAAAAAAAAAAAAAAAAAAAAwMTAhMAkGBSsOAwIaBQAEFAHhkoRK/a3oLvdRsSVN08feOXu0BAgJqCGmOy2P4AICB9AAAA\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json
index 6f5cb080..061e50f2 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform-removed.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "d6859b02-e693-464d-b954-9f087806574a",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "4fdf7e7a-b591-4ad3-875e-06ff402500a3",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/d6859b02-e693-464d-b954-9f087806574a",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/d6859b02-e693-464d-b954-9f087806574a"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "i9FzOBb9HtmJ1WrkhdlV7Og0hXhXVD0cr6xl",
-    "certificate": "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\u003d\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"cc21e223-7989-4d01-b24a-cf8d29e96ed2","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"0530dd0d-ec65-429b-aea7-518e85963f89","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/cc21e223-7989-4d01-b24a-cf8d29e96ed2","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/cc21e223-7989-4d01-b24a-cf8d29e96ed2"},"authentication":{"type":"P12","secret":"O0RgRMDUgRefO#9A4btVllRZEPstBRjrSk2I","certificate":"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\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json
index 4baf0978..3322b67c 100644
--- a/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json
+++ b/agrirouter-sdk-java-tests/onboarding-responses/telemetry-platform.json
@@ -1,15 +1 @@
-{
-  "deviceAlternateId": "60666b46-eec1-42d1-833d-b27fb95adfcc",
-  "capabilityAlternateId": "3035ec70-dca1-4d71-a000-e79eb5891f81",
-  "sensorAlternateId": "2595b8b0-6446-4fac-a40e-4b69bf9749e6",
-  "connectionCriteria": {
-    "gatewayId": "3",
-    "measures": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/60666b46-eec1-42d1-833d-b27fb95adfcc",
-    "commands": "https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/60666b46-eec1-42d1-833d-b27fb95adfcc"
-  },
-  "authentication": {
-    "type": "P12",
-    "secret": "kEPqAfJXwRp85fsB13jxHxv3x0AFrnRdcK2e",
-    "certificate": "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\u003d"
-  }
-}
\ No newline at end of file
+{"deviceAlternateId":"10003504-3ed0-4138-b240-f1aba064972f","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"37c26248-011b-4312-9a32-e8e31affdd7a","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/10003504-3ed0-4138-b240-f1aba064972f","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/10003504-3ed0-4138-b240-f1aba064972f"},"authentication":{"type":"P12","secret":"9#bACy1M83RgZaCUu1FtlfwdO!3YiZKFwZom","certificate":"MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCBAAwgDCABgkqhkiG9w0BBwGggCSABIIEADCCBRowggUWBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQIKpqa0i3T098CAgfQBIIEyJDauphBrNR5lZjLaBWCQuahTUekoJzl6ImTSLsKDsDt3UhVtqq5wpKvc/Ucr2pHGQY0QCChPLzWphfuVuX2qEUnmQKyD/TJbalfwu0ZDqe1vTUoWjPKbgKOc2oKRp1XfiJrafboLBUDafVY8c+cpD+nn7nZstGznLDLlfzFVN3E5grEVhbsD4ESVWQa05h0jtvwrph9gj3Wg8Gh17iInqLgB7RYhT8Q32Dny5qqORnJzEJ7AJyuxZsbWQ2mAJbd9njJhQwMivObB7O2RIOhcbi4cYILsi8srjf6oBAAULBq5vsrjhUmxT9nh1+Br8nnvsmlPeGdWSOgR4QV6kCTafB3npqkA1y9Gy0qMYFyd7O8v9XzGOa/QSDMLbb+I7zHEFtRZn6Dx8DzuNyDvBR51Ht8VB6WbT+IgdWIHTaLs5AEPGg7zqRc0CZ4mh2PK5RdMsx556djC9ZN1siDUHsPYwmfo3VzlHSI07yb43hIPG750iEVo2NY54BNnBmK3ClfbzrkdvMHkfKz4HiM6xM84oyZxIB3B/2p/3G6NnMoAr4zUSdcwU5fRn9EKMD6oqe5zt594o7vTJwxju+mDprpVLCxp6Pvz8R3piBxIHZ0EL1s3i8hpo6uVc9TuNLWMtojVC2HN1OMs8vx6n/LaonOG6s8rsuucO4dwGzrU/1fqnkkRbuwhO+yVYDJb6JA+14HV6EQv51L0e4OMR0BxJZV4q3GD1WZtFsJ+G4wWapx/5dl1Clih7gkRi6OBugp5MAeYnkdFb4QziBoqg7dOilQnzkXd3zfvMxOVWfTfvcHCdK+SWrYuFHb1VCKNAtZ6WyrSkMeKV8/DGZdAvWWwVH23pChM14YOamurNDGsMm+Uln9r3mhRSWiaWdUnnW+NRSujS5Y7fqRl3SZ16cRhKhex8pjV2om1MHfzJlmMGlOW6g0bDVWhijYSNXTLN8tytTC9HNaDANhOH+z/xd/X1QjamN9vPrXjLUzCZb636Bp04KmIfuoyD4Mq/rh6wg/x7VSjJAihhtW6uayu5BqQOC90qPvE9Qt/gkQYPmi3p6xKn/RJmnBNv3SdSPiCimIzy5ApVM7DmWIlZ5bcEPfd+xdiTMtDFiINCc8jOlyShLaJjJSaOuKBhIJON2VdWqv/KVnopvU/KCpepCDD2dvDIRn3/xespevAtRXXqWKKkDpV597mhQEgFq/ook1qBhRCISO2e+Wa94ynajL7YS/ZduBRWHV4AZvQLgAXXPSBIIEAEPK+M+ssmSSvq2myBUu1k45SIu4xB5QBIIBHvPKmwa5xzSAknDc36cS0890lhZQZIk7wrJTPSXJD7KotaWS3CXccsUj/iCtHRNfAU6DTL+0nq3MbTxWlENxEaYxI+AHU1Gi2It6IhjMVK21i2MiEq7NEqUrnqUft6ZaBXzUJDCp+8W7S/nvDiUrkBFjk6zPVh9XuXy/g+j9+ZNUt/71HxkGpbLWMsCvvly4FHRPViKncjYA418VoXblKXVYlwc7aK4DredeJIqWeHyqf1erfXXTeFd6S28e1MZPA6gGjSKSgUPwAhdalZ89ocB9VIP3pWC8GZjCLuaMFlyOzYcZJfYMKhjkuOJWhhTjr3XFF/wTAHKZtPGOwmiI5JBU+gO179X9MRUwEwYJKoZIhvcNAQkVMQYEBAEAAAAAAAAAAAAwgAYJKoZIhvcNAQcGoIAwgAIBADCABgkqhkiG9w0BBwEwHAYKKoZIhvcNAQwBBjAOBAhn+IO8ddDOLgICB9CggASCBLgXKsDezk3h8GYG9uwlyIIPyhOjcAUD//GJx/NlOi23WMWUhj0oOl4besRa9WmFI75IoHY4Gfu8nSr3nFbc5ZHi9TN2oKUnLoSE5htmcdd2gIMsiuBvOGPsObxkKGdQOMNhKqtN/TjWuUnuRkjKtT8wcQpJ+zfl8oOcNZ5xS6R9vgV0a/ZNrXQhBBuF34QA28MCw24EcrVHUm9WI3YzBiNz2er49zBdJMznOflZr93VeDe+VL9GqqFakmMiORimFD/qirtT4Q7Ljp1FWUifSPFs1ySj+HaMWNrmFS4r7lZE5urVJZ3mnwItH0KVNwrfj5XT9br2YbDoVQUzU7e76If4E7g60dm1HKRZ6Ugsg3DMlaxEsWrhmvh28gCoyLdBjlIi+iB0bLewcIELbPV7dABvcNy/LuE3n+7sHiNqTXUx2EBUtsr5gjJdA+e+162+iHP7suxFF+VQ84bAxSd34VhG/diLV/jvaDVpZUESU9LvG5DoKXOux3R0exmoX0buC2OuZ7hOFImSLlUDFOj4Tq6WrmsHG8+h335MAQfTy4W3cu8FZ+NPxKtLhoXPV5F4HAu0cN9JwlDIR5TpD2w0u5VV4ThmfApiSrhEbdYiZaDfnedIor3kqmbdGatOI+3/MygJM5xGf5Pe+SMkQNzq2gtX6F38+qjHwtON3cx44lAToFVfeBCtFMAmW5UHU84rnxawdsrYi5cwBY8AUTnBdYhCzApFfYoT/gBgdMGR1EuYdvHV2ZZS7a5iirk6X3R8McqSyuXYX5GBsEgC44g0k46GdZTLjghi2qgN0NH70GBT3eSjg5EV1SLPFRtoJE1UPkT+lwEMVAt35MF8pcUEggJIY4wQHI1SmQuJcGXN3M6x9HWmU4xRNCG/4GEn7FSYuAwbqRVoDiHbGRwwgqgBwTHFmPhXzc5gCyPWWjEJKGE/fF5zyYmUypeabeLoeeguM+sDMw8LbD1X6ezHG6CbVSCpAgFWws3A7nasvXDKz7S/z6VvaXmFlz8nilX/kJHozvRRFNlFxBgS1cZmiXamobrBqx/OLV2L3zw8VV5VmhsKIWfXNq5F3WGkmm3D2drRXAMKZ9dy75AwH7w4DT7Mo9yplylMfU8X3grXiefm3yMLSl18Yq0xwZUVFeKzIclOfnJ0m7FJNyMxDsqX6vmUaf/9qVU2mEPRLX1KaHlR7+ZYLGDFux2bVnse/32ZyMokP/EFA37pMIWSbicuuvs8+Upjg6zflwYmGQH/R/lUO5kUXfmYIsibsmV+Ep3lOl3GlPCt5LyC3KmMfK9ZtVHx+Oq3GX/pfL+UD0KS6yi96dqUiP2lDt3QdHkhkjGTzwoMaSQW8gmNbv3IqOnkStxZryoFSq7tPqufD3h8ji8BQgmBI0DCXBb+6DxBAa6KykgLqSB94IIkWux65nHHwmlIzaL5YBx+AmemuLnM06AmcxnpPxaUrmZiLwgxXg+29e9YWJsiyvvZ3xZpLho9aO/Fww/lkFeoNLzBoo47fy+pk26LHMeN9M1PFqGLUPy4HcIqPCr2HcqdKtReQQSXg+f3KHqRMYMtESMpJsS/fXUo9HRcNU1PpW59XKsRIjctsOZctfykwfabg+KNz03QSTQAAAAAAAAAAAAAAAAAAAAAAAAwMTAhMAkGBSsOAwIaBQAEFPEWu4qq73KpSD+cHc+uhqXgN/OXBAjeBJcrY2uPfgICB9AAAA\u003d\u003d"}}
\ No newline at end of file
diff --git a/agrirouter-sdk-java-tests/pom.xml b/agrirouter-sdk-java-tests/pom.xml
index bbcad8ed..080d0a9b 100644
--- a/agrirouter-sdk-java-tests/pom.xml
+++ b/agrirouter-sdk-java-tests/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>AGRIROUTER SDK JAVA - TESTS</name>
-    <artifactId>agrirouter-api-tests</artifactId>
+    <artifactId>agrirouter-sdk-java-tests</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
index deda31e1..d59df475 100644
--- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/AbstractIntegrationTest.java
@@ -34,6 +34,20 @@ protected void waitForTheAgrirouterToProcessMultipleMessages() throws Interrupte
     Thread.sleep(TimeUnit.SECONDS.toMillis(60));
   }
 
+  /** Communication unit for integration testing. */
+  protected Application communicationUnit =
+      new Application() {
+        @Override
+        public String getApplicationId() {
+          return "434989e2-b4be-4cfd-8e40-f5b89d83458d";
+        }
+
+        @Override
+        public String getCertificationVersionId() {
+          return "f491d487-f913-4732-8be4-c2eacff21816";
+        }
+      };
+
   /** Farming software for integration testing. */
   protected Application farmingSoftware =
       new Application() {
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
index b7441dfc..7a12d3db 100644
--- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/OnboardingResponseRepository.java
@@ -48,7 +48,8 @@ public enum Identifier {
     FARMING_SOFTWARE_DEACTIVATED("farming-software-deactivated"),
     TELEMETRY_PLATFORM("telemetry-platform"),
     TELEMETRY_PLATFORM_REMOVED("telemetry-platform-removed"),
-    TELEMETRY_PLATFORM_DEACTIVATED("telemetry-platform-deactivated");
+    TELEMETRY_PLATFORM_DEACTIVATED("telemetry-platform-deactivated"),
+    COMMUNICATION_UNIT("communication-unit");
 
     private final String fileName;
 
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java
new file mode 100644
index 00000000..9f22a6fe
--- /dev/null
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/CommunicationUnitFixture.java
@@ -0,0 +1,78 @@
+package com.dke.data.agrirouter.test.fixture;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import agrirouter.request.payload.endpoint.Capabilities;
+import com.dke.data.agrirouter.api.cancellation.DefaultCancellationToken;
+import com.dke.data.agrirouter.api.dto.onboard.OnboardingResponse;
+import com.dke.data.agrirouter.api.enums.ApplicationType;
+import com.dke.data.agrirouter.api.enums.CertificationType;
+import com.dke.data.agrirouter.api.enums.ContentMessageType;
+import com.dke.data.agrirouter.api.enums.Gateway;
+import com.dke.data.agrirouter.api.env.QA;
+import com.dke.data.agrirouter.api.service.onboard.OnboardingService;
+import com.dke.data.agrirouter.api.service.parameters.OnboardingParameters;
+import com.dke.data.agrirouter.api.service.parameters.SetCapabilitiesParameters;
+import com.dke.data.agrirouter.impl.messaging.rest.FetchMessageServiceImpl;
+import com.dke.data.agrirouter.impl.messaging.rest.SetCapabilityServiceImpl;
+import com.dke.data.agrirouter.impl.onboard.OnboardingServiceImpl;
+import com.dke.data.agrirouter.test.AbstractIntegrationTest;
+import com.dke.data.agrirouter.test.OnboardingResponseRepository;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.UUID;
+import org.junit.jupiter.api.Test;
+
+/** Class to onboard endpoints for different reasons. */
+@SuppressWarnings("ALL")
+class CommunicationUnitFixture extends AbstractIntegrationTest {
+
+  /**
+   * Create a new registration token by using the agrirouter UI and select the integration test
+   * application for CUs.
+   */
+  @Test
+  // @Disabled("Please replace the placeholder for the registration code to run the test case.")
+  void onboardCommunicationUnitAndSaveToFile() throws IOException {
+    OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
+    OnboardingParameters onboardingParameters = new OnboardingParameters();
+    onboardingParameters.setRegistrationCode("06535d66c2");
+    onboardingParameters.setApplicationId(communicationUnit.getApplicationId());
+    onboardingParameters.setCertificationVersionId(communicationUnit.getCertificationVersionId());
+    onboardingParameters.setCertificationType(CertificationType.P12);
+    onboardingParameters.setGatewayId(Gateway.REST.getKey());
+    onboardingParameters.setApplicationType(ApplicationType.APPLICATION);
+    onboardingParameters.setUuid(UUID.randomUUID().toString());
+    final OnboardingResponse onboardingResponse = onboardingService.onboard(onboardingParameters);
+    assertNotNull(onboardingResponse);
+    assertNotNull(onboardingResponse.getCapabilityAlternateId());
+    assertNotNull(onboardingResponse.getDeviceAlternateId());
+    assertNotNull(onboardingResponse.getSensorAlternateId());
+    assertNotNull(onboardingResponse.getAuthentication());
+    assertNotNull(onboardingResponse.getAuthentication().getCertificate());
+    assertNotNull(onboardingResponse.getAuthentication().getSecret());
+    assertNotNull(onboardingResponse.getAuthentication().getType());
+    assertNotNull(onboardingResponse.getConnectionCriteria());
+    assertNotNull(onboardingResponse.getConnectionCriteria().getMeasures());
+    assertNotNull(onboardingResponse.getConnectionCriteria().getCommands());
+    OnboardingResponseRepository.save(
+        OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT, onboardingResponse);
+    final SetCapabilityServiceImpl setCapabilityService = new SetCapabilityServiceImpl(new QA() {});
+    final SetCapabilitiesParameters setCapabilitiesParameters = new SetCapabilitiesParameters();
+    setCapabilitiesParameters.setApplicationId(communicationUnit.getApplicationId());
+    setCapabilitiesParameters.setCertificationVersionId(
+        communicationUnit.getCertificationVersionId());
+    setCapabilitiesParameters.setOnboardingResponse(onboardingResponse);
+    final SetCapabilitiesParameters.CapabilityParameters capabilityParameters =
+        new SetCapabilitiesParameters.CapabilityParameters();
+    capabilityParameters.setDirection(Capabilities.CapabilitySpecification.Direction.SEND_RECEIVE);
+    capabilityParameters.setTechnicalMessageType(ContentMessageType.ISO_11783_TASKDATA_ZIP);
+    setCapabilitiesParameters.setCapabilitiesParameters(
+        Collections.singletonList(capabilityParameters));
+    setCapabilityService.send(setCapabilitiesParameters);
+    final FetchMessageServiceImpl fetchMessageService = new FetchMessageServiceImpl();
+    fetchMessageService.fetch(
+        onboardingResponse,
+        new DefaultCancellationToken(MAX_TRIES_BEFORE_FAILURE, DEFAULT_INTERVAL));
+  }
+}
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
index 08791d4d..6c663e81 100644
--- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Test;
 
 /** Class to onboard endpoints for different reasons. */
+@SuppressWarnings("ALL")
 class FarmingSoftwareFixture extends AbstractIntegrationTest {
 
   /**
@@ -29,7 +30,7 @@ class FarmingSoftwareFixture extends AbstractIntegrationTest {
   void onboardFarmingSoftwareAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("e757d7aff5");
+    onboardingParameters.setRegistrationCode("ef1c0c59ba");
     onboardingParameters.setApplicationId(farmingSoftware.getApplicationId());
     onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
@@ -63,7 +64,7 @@ void onboardFarmingSoftwareAndSaveToFile() throws IOException {
   void onboardAndDeactivateFarmingSoftwareAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("aff2b14ef6");
+    onboardingParameters.setRegistrationCode("a496822032");
     onboardingParameters.setApplicationId(farmingSoftware.getApplicationId());
     onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
@@ -97,7 +98,7 @@ void onboardAndDeactivateFarmingSoftwareAndSaveToFile() throws IOException {
   void onboardAndRemoveFarmingSoftwareAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("cf968d4af7");
+    onboardingParameters.setRegistrationCode("bc4eba6065");
     onboardingParameters.setApplicationId(farmingSoftware.getApplicationId());
     onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
index 8e91e922..406715b6 100644
--- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/TelemetryPlatformFixture.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Test;
 
 /** Class to onboard endpoints for different reasons. */
+@SuppressWarnings("ALL")
 class TelemetryPlatformFixture extends AbstractIntegrationTest {
 
   /**
@@ -29,7 +30,7 @@ class TelemetryPlatformFixture extends AbstractIntegrationTest {
   void onboardTelemetryPlatformAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("feea39bdcb");
+    onboardingParameters.setRegistrationCode("3e22929d3f");
     onboardingParameters.setApplicationId(telemetryPlatform.getApplicationId());
     onboardingParameters.setCertificationVersionId(telemetryPlatform.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
@@ -63,7 +64,7 @@ void onboardTelemetryPlatformAndSaveToFile() throws IOException {
   void onboardAndDeactivateTelemetryPlatformAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("66eed4c898");
+    onboardingParameters.setRegistrationCode("b8dbca89d8");
     onboardingParameters.setApplicationId(telemetryPlatform.getApplicationId());
     onboardingParameters.setCertificationVersionId(telemetryPlatform.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
@@ -97,7 +98,7 @@ void onboardAndDeactivateTelemetryPlatformAndSaveToFile() throws IOException {
   void onboardAndRemoveTelemetryPlatformAndSaveToFile() throws IOException {
     OnboardingService onboardingService = new OnboardingServiceImpl(new QA() {});
     SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters();
-    onboardingParameters.setRegistrationCode("bf076ee177");
+    onboardingParameters.setRegistrationCode("bea75dff01");
     onboardingParameters.setApplicationId(telemetryPlatform.getApplicationId());
     onboardingParameters.setCertificationVersionId(telemetryPlatform.getCertificationVersionId());
     onboardingParameters.setCertificationType(CertificationType.P12);
diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java
index 0253ed02..16234127 100644
--- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java
+++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/messaging/rest/SendChunkedMessageTest.java
@@ -53,7 +53,12 @@ class SendChunkedMessageTest extends AbstractIntegrationTest {
     messageHeaderParameters.setApplicationMessageId(MessageIdService.generateMessageId());
     messageHeaderParameters.setApplicationMessageSeqNo(
         SequenceNumberService.generateSequenceNumberForEndpoint(onboardingResponse));
-    messageHeaderParameters.setMode(Request.RequestEnvelope.Mode.PUBLISH);
+    messageHeaderParameters.setMode(Request.RequestEnvelope.Mode.DIRECT);
+    messageHeaderParameters.setRecipients(
+        Collections.singletonList(
+            OnboardingResponseRepository.read(
+                    OnboardingResponseRepository.Identifier.COMMUNICATION_UNIT)
+                .getSensorAlternateId()));
 
     PayloadParameters payloadParameters = new PayloadParameters();
     payloadParameters.setValue(messageContent);
diff --git a/pom.xml b/pom.xml
index 6cc2ed2e..5e3f16a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,11 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-nop</artifactId>
+                <version>${slf4j-api.version}</version>
+            </dependency>
 
             <!-- MQTT -->
             <dependency>
@@ -292,6 +297,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
     </dependencies>
 
     <build>