diff --git a/ocpp-1-6-api-adapter/src/main/kotlin/com/izivia/ocpp/adapter16/mapper/SetChargingProfileMapper.kt b/ocpp-1-6-api-adapter/src/main/kotlin/com/izivia/ocpp/adapter16/mapper/SetChargingProfileMapper.kt
index 9a84b9db..571412d2 100644
--- a/ocpp-1-6-api-adapter/src/main/kotlin/com/izivia/ocpp/adapter16/mapper/SetChargingProfileMapper.kt
+++ b/ocpp-1-6-api-adapter/src/main/kotlin/com/izivia/ocpp/adapter16/mapper/SetChargingProfileMapper.kt
@@ -29,4 +29,4 @@ abstract class SetChargingProfileMapper {
     )
     abstract fun coreToGenReq(setChargingProfileReq: SetChargingProfileReq): SetChargingProfileReqGen
 
-}
\ No newline at end of file
+}
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Request.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Request.kt
new file mode 100644
index 00000000..94f66532
--- /dev/null
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Request.kt
@@ -0,0 +1,3 @@
+package com.izivia.ocpp.core16.model
+
+interface Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Response.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Response.kt
new file mode 100644
index 00000000..19472475
--- /dev/null
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Response.kt
@@ -0,0 +1,3 @@
+package com.izivia.ocpp.core16.model
+
+interface Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeReq.kt
index 0737092d..0d6fe915 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.authorize
 
+import com.izivia.ocpp.core16.model.Request
+
 data class AuthorizeReq(
     val idTag: String
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeResp.kt
index 054bfee9..4e3d70cb 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.authorize
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.IdTagInfo
 
 data class AuthorizeResp(
     val idTagInfo: IdTagInfo
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationReq.kt
index a197abf9..075b578a 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.bootnotification
 
+import com.izivia.ocpp.core16.model.Request
+
 data class BootNotificationReq(
     val chargePointModel: String,
     val chargePointVendor: String,
@@ -10,4 +12,4 @@ data class BootNotificationReq(
     val imsi: String? = null,
     val meterSerialNumber: String? = null,
     val meterType: String? = null
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationResp.kt
index 46493a94..59f064b9 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationResp.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.bootnotification
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.bootnotification.enumeration.RegistrationStatus
 import kotlinx.datetime.Instant
 
@@ -7,4 +8,4 @@ data class BootNotificationResp(
     val currentTime: Instant,
     val interval: Int,
     val status: RegistrationStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationReq.kt
index ce2dcef4..236c4979 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.cancelreservation
 
+import com.izivia.ocpp.core16.model.Request
+
 data class CancelReservationReq(
     val reservationId: Int
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationResp.kt
index 469398c9..78b932cc 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.cancelreservation
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.cancelreservation.enumeration.CancelReservationStatus
 
 data class CancelReservationResp(
     val status: CancelReservationStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedReq.kt
index d702f941..7b072896 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.certificatesigned
 
+import com.izivia.ocpp.core16.model.Request
+
 data class CertificateSignedReq(
     val certificateChain: String
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedResp.kt
index fe5ee236..5ad1855d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.certificatesigned
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.certificatesigned.enumeration.DeleteCertificateStatusEnumType
 
 data class CertificateSignedResp(
     val status: DeleteCertificateStatusEnumType
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityReq.kt
index a46c0bc6..931bd3c1 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityReq.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.changeavailability
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.changeavailability.enumeration.AvailabilityType
 
 data class ChangeAvailabilityReq(
     val connectorId: Int,
     val type: AvailabilityType
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityResp.kt
index 2367334a..f3d1a1e7 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.changeavailability
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.changeavailability.enumeration.AvailabilityStatus
 
 data class ChangeAvailabilityResp(
     val status: AvailabilityStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationReq.kt
index a502a5d3..0850f4f3 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationReq.kt
@@ -1,6 +1,8 @@
 package com.izivia.ocpp.core16.model.changeconfiguration
 
+import com.izivia.ocpp.core16.model.Request
+
 data class ChangeConfigurationReq(
     val key: String,
     val value: String
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationResp.kt
index e3e734ce..6a1a3a15 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.changeconfiguration
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.changeconfiguration.enumeration.ConfigurationStatus
 
 data class ChangeConfigurationResp(
     val status: ConfigurationStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheReq.kt
index 325efd30..202fae4c 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheReq.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.clearcache
 
-class ClearCacheReq
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Request
+
+class ClearCacheReq : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheResp.kt
index b56d54fa..561fd969 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.clearcache
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.clearcache.enumeration.ClearCacheStatus
 
 data class ClearCacheResp(
     val status: ClearCacheStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileReq.kt
index 2db8d6d3..e06e0fd1 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.clearchargingprofile
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.enumeration.ChargingProfilePurposeType
 
 data class ClearChargingProfileReq(
@@ -7,4 +8,4 @@ data class ClearChargingProfileReq(
     val connectorId: Int? = null,
     val chargingProfilePurpose: ChargingProfilePurposeType? = null,
     val stackLevel: Int? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileResp.kt
index d40b7a16..4355ade0 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.clearchargingprofile
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.clearchargingprofile.enumeration.ClearChargingProfileStatus
 
 data class ClearChargingProfileResp(
     val status: ClearChargingProfileStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/common/enumeration/Actions.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/common/enumeration/Actions.kt
index cbb58a31..ce134152 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/common/enumeration/Actions.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/common/enumeration/Actions.kt
@@ -8,7 +8,7 @@ import com.izivia.ocpp.core16.model.cancelreservation.CancelReservationReq
 import com.izivia.ocpp.core16.model.cancelreservation.CancelReservationResp
 import com.izivia.ocpp.core16.model.certificatesigned.CertificateSignedReq
 import com.izivia.ocpp.core16.model.certificatesigned.CertificateSignedResp
-import com.izivia.ocpp.core16.model.certificatesigned.DeleteCertificateResp
+import com.izivia.ocpp.core16.model.deletecertificate.DeleteCertificateResp
 import com.izivia.ocpp.core16.model.changeavailability.ChangeAvailabilityReq
 import com.izivia.ocpp.core16.model.changeavailability.ChangeAvailabilityResp
 import com.izivia.ocpp.core16.model.changeconfiguration.ChangeConfigurationReq
@@ -24,8 +24,8 @@ import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.DiagnosticsSta
 import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.DiagnosticsStatusNotificationResp
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.FirmwareStatusNotificationReq
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.FirmwareStatusNotificationResp
-import com.izivia.ocpp.core16.model.firmwarestatusnotification.SignedFirmwareStatusNotificationReq
-import com.izivia.ocpp.core16.model.firmwarestatusnotification.SignedFirmwareStatusNotificationResp
+import com.izivia.ocpp.core16.model.signedfirmwarestatusnotification.SignedFirmwareStatusNotificationReq
+import com.izivia.ocpp.core16.model.signedfirmwarestatusnotification.SignedFirmwareStatusNotificationResp
 import com.izivia.ocpp.core16.model.getcompositeschedule.GetCompositeScheduleReq
 import com.izivia.ocpp.core16.model.getcompositeschedule.GetCompositeScheduleResp
 import com.izivia.ocpp.core16.model.getconfiguration.GetConfigurationReq
@@ -68,14 +68,14 @@ import com.izivia.ocpp.core16.model.statusnotification.StatusNotificationReq
 import com.izivia.ocpp.core16.model.statusnotification.StatusNotificationResp
 import com.izivia.ocpp.core16.model.stoptransaction.StopTransactionReq
 import com.izivia.ocpp.core16.model.stoptransaction.StopTransactionResp
-import com.izivia.ocpp.core16.model.triggermessage.ExtendedTriggerMessageReq
-import com.izivia.ocpp.core16.model.triggermessage.ExtendedTriggerMessageResp
+import com.izivia.ocpp.core16.model.extendedtriggermessage.ExtendedTriggerMessageReq
+import com.izivia.ocpp.core16.model.extendedtriggermessage.ExtendedTriggerMessageResp
 import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageReq
 import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageResp
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorReq
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorResp
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareReq
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareResp
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareReq
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareResp
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareReq
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareResp
 import com.izivia.ocpp.utils.IActions
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferReq.kt
index 5f9369cc..3ee15065 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferReq.kt
@@ -1,7 +1,9 @@
 package com.izivia.ocpp.core16.model.datatransfer
 
+import com.izivia.ocpp.core16.model.Request
+
 data class DataTransferReq(
     val vendorId: String,
     val messageId: String? = null,
     val data: String? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferResp.kt
index 1a3bfbff..b8bfc0bc 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferResp.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.datatransfer
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.datatransfer.enumeration.DataTransferStatus
 
 data class DataTransferResp(
     val status: DataTransferStatus,
     val data: String? = null
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateReq.kt
index c1241b5a..9f1a4b39 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateReq.kt
@@ -1,10 +1,11 @@
 package com.izivia.ocpp.core16.model.deletecertificate
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.deletecertificate.enumeration.HashAlgorithmEnumType
 
 data class DeleteCertificateReq(
     val certificateHashData: CertificateHashDataType
-)
+) : Request
 
 data class CertificateHashDataType(
     val hashAlgorithm: HashAlgorithmEnumType,
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateResp.kt
index 2cfc2851..daebbaf3 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateResp.kt
@@ -1,7 +1,8 @@
-package com.izivia.ocpp.core16.model.certificatesigned
+package com.izivia.ocpp.core16.model.deletecertificate
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.certificatesigned.enumeration.DeleteCertificateStatusEnumType
 
 data class DeleteCertificateResp(
     val status: DeleteCertificateStatusEnumType
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationReq.kt
index 422c4421..4d892083 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationReq.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.diagnosticsstatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.enumeration.DiagnosticsStatus
 
 data class DiagnosticsStatusNotificationReq(
-        val status: DiagnosticsStatus
-)
\ No newline at end of file
+    val status: DiagnosticsStatus
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationResp.kt
index 99f04bbc..616b6768 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.diagnosticsstatusnotification
 
-class DiagnosticsStatusNotificationResp
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Response
+
+class DiagnosticsStatusNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageReq.kt
index dbd5f713..4a5ead34 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageReq.kt
@@ -1,8 +1,9 @@
-package com.izivia.ocpp.core16.model.triggermessage
+package com.izivia.ocpp.core16.model.extendedtriggermessage
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.MessageTrigger
 
 data class ExtendedTriggerMessageReq(
     val requestedMessage: MessageTrigger,
     val connectorId: Int? = null
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageResp.kt
index 8964a2f5..ba7711bf 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageResp.kt
@@ -1,7 +1,8 @@
-package com.izivia.ocpp.core16.model.triggermessage
+package com.izivia.ocpp.core16.model.extendedtriggermessage
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.TriggerMessageStatus
 
 data class ExtendedTriggerMessageResp(
     val status: TriggerMessageStatus
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationReq.kt
index 7ba75b82..f61bbf74 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationReq.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.firmwarestatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.enumeration.FirmwareStatus
 
 data class FirmwareStatusNotificationReq(
-        val status: FirmwareStatus
-)
\ No newline at end of file
+    val status: FirmwareStatus
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationResp.kt
index 69b13dd9..b506bb81 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.firmwarestatusnotification
 
-class FirmwareStatusNotificationResp
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Response
+
+class FirmwareStatusNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleReq.kt
index 2372dd9a..7100bcc2 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleReq.kt
@@ -1,9 +1,10 @@
 package com.izivia.ocpp.core16.model.getcompositeschedule
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.enumeration.ChargingRateUnitType
 
 data class GetCompositeScheduleReq(
     val connectorId: Int,
     val duration: Int,
     val chargingRateUnit: ChargingRateUnitType? = null
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleResp.kt
index e3920019..bf58ef27 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleResp.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.getcompositeschedule
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.ChargingSchedule
 import com.izivia.ocpp.core16.model.getcompositeschedule.enumeration.GetCompositeScheduleStatus
 import kotlinx.datetime.Instant
@@ -9,4 +10,4 @@ data class GetCompositeScheduleResp(
     val connectorId: Int? = null,
     val scheduleStart: Instant? = null,
     val chargingSchedule: ChargingSchedule? = null
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationReq.kt
index ddbbec80..cc39ea8d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.getconfiguration
 
+import com.izivia.ocpp.core16.model.Request
+
 data class GetConfigurationReq(
     val key: List<String>? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationResp.kt
index fe270b0c..68c637f7 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationResp.kt
@@ -1,6 +1,8 @@
 package com.izivia.ocpp.core16.model.getconfiguration
 
+import com.izivia.ocpp.core16.model.Response
+
 data class GetConfigurationResp(
     val configurationKey: List<KeyValue>? = null,
     val unknownKey: List<String>? = null
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsReq.kt
index b59772c0..486dfbd2 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.getdiagnostics
 
+import com.izivia.ocpp.core16.model.Request
 import kotlinx.datetime.Instant
 
 data class GetDiagnosticsReq(
@@ -8,4 +9,4 @@ data class GetDiagnosticsReq(
     val retryInterval: Int? = null,
     val startTime: Instant? = null,
     val stopTime: Instant? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsResp.kt
index b36b7c99..7a566265 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getdiagnostics/GetDiagnosticsResp.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.getdiagnostics
 
+import com.izivia.ocpp.core16.model.Response
+
 data class GetDiagnosticsResp(
     val fileName: String? = null
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsReq.kt
index d12df6de..79d0ff8d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsReq.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.getinstalledcertificateids
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.getinstalledcertificateids.enumeration.CertificateUseEnumType
 
 data class GetInstalledCertificateIdsReq(
     val certificateType: CertificateUseEnumType
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsResp.kt
index 2d2f10ce..c69caf5b 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getinstalledcertificateids/GetInstalledCertificateIdsResp.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.getinstalledcertificateids
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.deletecertificate.CertificateHashDataType
 import com.izivia.ocpp.core16.model.getinstalledcertificateids.enumeration.CertificateUseEnumType
 import com.izivia.ocpp.core16.model.getinstalledcertificateids.enumeration.GetInstalledCertificateStatusEnumType
@@ -7,4 +8,4 @@ import com.izivia.ocpp.core16.model.getinstalledcertificateids.enumeration.GetIn
 data class GetInstalledCertificateIdsResp(
     val status: GetInstalledCertificateStatusEnumType,
     val certificateHashDataType: List<CertificateHashDataType>?
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionReq.kt
index b3c430e6..65fc1772 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionReq.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.getlocallistversion
 
-class GetLocalListVersionReq
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Request
+
+class GetLocalListVersionReq : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionResp.kt
index cd31b998..367cf50e 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlocallistversion/GetLocalListVersionResp.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.getlocallistversion
 
+import com.izivia.ocpp.core16.model.Response
+
 data class GetLocalListVersionResp(
     val listVersion: Int
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogReq.kt
index f78471bf..d4e5521b 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.getlog
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.getlog.enumeration.LogEnumType
 import java.sql.Timestamp
 
@@ -9,7 +10,7 @@ data class GetLogReq(
     val retries: Int?,
     val retryInterval: Int?,
     val log: LogParametersType
-)
+) : Request
 
 data class LogParametersType(
     val remoteLocation: String,
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogResp.kt
index 6e189d64..28f4f6db 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getlog/GetLogResp.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.getlog
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.getlog.enumeration.LogStatusEnumType
 
 data class GetLogResp(
     val status: LogStatusEnumType,
     val filename: String?
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatReq.kt
index 4864a997..c58b6ac0 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatReq.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.heartbeat
 
-class HeartbeatReq
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Request
+
+class HeartbeatReq : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatResp.kt
index 8c8e95af..b1ae833f 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/heartbeat/HeartbeatResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.heartbeat
 
+import com.izivia.ocpp.core16.model.Response
 import kotlinx.datetime.Instant
 
 data class HeartbeatResp(
     val currentTime: Instant
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateReq.kt
index 4ca55b82..f07dc080 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateReq.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.installcertificate
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.getinstalledcertificateids.enumeration.CertificateUseEnumType
 
 data class InstallCertificateReq(
     val certificateType: CertificateUseEnumType,
     val certificate: String
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateResp.kt
index 3a4b3f06..f3615d5d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/installcertificate/InstallCertificateResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.installcertificate
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.installcertificate.enumeration.CertificateStatusEnumType
 
 data class InstallCertificateResp(
     val status: CertificateStatusEnumType
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationReq.kt
index 0e562a16..18556df9 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationReq.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.logstatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.logstatusnotification.enumeration.UpdateLogStatusEnumType
 
 data class LogStatusNotificationReq(
     val status: UpdateLogStatusEnumType,
     val requestId: Int?
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationResp.kt
index 0c47df72..f9e003f4 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/logstatusnotification/LogStatusNotificationResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.logstatusnotification
 
-class LogStatusNotificationResp
+import com.izivia.ocpp.core16.model.Response
+
+class LogStatusNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesReq.kt
index 429fa6aa..7451e932 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesReq.kt
@@ -1,9 +1,10 @@
 package com.izivia.ocpp.core16.model.metervalues
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.MeterValue
 
 data class MeterValuesReq(
     val connectorId: Int,
     val meterValue: List<MeterValue>,
     val transactionId: Int? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesResp.kt
index 10376bd1..1f0018d7 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/metervalues/MeterValuesResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.metervalues
 
-class MeterValuesResp
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Response
+
+class MeterValuesResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionReq.kt
index cf70df10..42c5c5ae 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionReq.kt
@@ -1,9 +1,10 @@
 package com.izivia.ocpp.core16.model.remotestart
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.ChargingProfile
 
 data class RemoteStartTransactionReq(
     val idTag: String,
     val connectorId: Int? = null,
     val chargingProfile: ChargingProfile? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionResp.kt
index 3c618cb4..b3d145a6 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestart/RemoteStartTransactionResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.remotestart
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.enumeration.RemoteStartStopStatus
 
 data class RemoteStartTransactionResp(
     val status: RemoteStartStopStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionReq.kt
index 3b227cba..4ba8f1f7 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.remotestop
 
+import com.izivia.ocpp.core16.model.Request
+
 data class RemoteStopTransactionReq(
     val transactionId: Int
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionResp.kt
index 68422668..59d0a23a 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/remotestop/RemoteStopTransactionResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.remotestop
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.enumeration.RemoteStartStopStatus
 
 data class RemoteStopTransactionResp(
     val status: RemoteStartStopStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowReq.kt
index cae1b1c2..2948ee27 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.reservenow
 
+import com.izivia.ocpp.core16.model.Request
 import kotlinx.datetime.Instant
 
 data class ReserveNowReq(
@@ -8,4 +9,4 @@ data class ReserveNowReq(
     val idTag: String,
     val reservationId: Int,
     val parentIdTag: String? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowResp.kt
index fc19f4df..f2d4cd9a 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reservenow/ReserveNowResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.reservenow
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.reservenow.enumeration.ReservationStatus
 
 data class ReserveNowResp(
     val status: ReservationStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetReq.kt
index b5d34d83..b3e2c1bb 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetReq.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.reset
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.reset.enumeration.ResetType
 
 data class ResetReq(
     val type: ResetType
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetResp.kt
index 89619dfd..c943cdc9 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/reset/ResetResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.reset
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.reset.enumeration.ResetStatus
 
 data class ResetResp(
     val status: ResetStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationReq.kt
index 861e6e76..0a30cd0b 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.securityeventnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.utils.HasActionTimestamp
 import kotlinx.datetime.Instant
 
@@ -7,4 +8,4 @@ data class SecurityEventNotificationReq(
     val type: String,
     override val timestamp: Instant,
     val techInfo: String? = null
-) : HasActionTimestamp
+) : HasActionTimestamp, Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationResp.kt
index b18ffb9f..a0617bd2 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/securityeventnotification/SecurityEventNotificationResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.securityeventnotification
 
-class SecurityEventNotificationResp
+import com.izivia.ocpp.core16.model.Response
+
+class SecurityEventNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListReq.kt
index 6ac0be84..0afdd27a 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListReq.kt
@@ -1,9 +1,10 @@
 package com.izivia.ocpp.core16.model.sendlocallist
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.sendlocallist.enumeration.UpdateType
 
 data class SendLocalListReq(
     val listVersion: Int,
     val updateType: UpdateType,
     val localAuthorizationList: List<AuthorizationData>? = null
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListResp.kt
index 31f0825f..63e6600b 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/sendlocallist/SendLocalListResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.sendlocallist
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.sendlocallist.enumeration.UpdateStatus
 
 data class SendLocalListResp(
     val status: UpdateStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileReq.kt
index f18a9d2c..851580a9 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileReq.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.setchargingprofile
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.ChargingProfile
 
 data class SetChargingProfileReq(
     val connectorId: Int,
     val csChargingProfiles: ChargingProfile
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileResp.kt
index 7ffa40f3..13254fba 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/setchargingprofile/SetChargingProfileResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.setchargingprofile
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.setchargingprofile.enumeration.ChargingProfileStatus
 
 data class SetChargingProfileResp(
     val status: ChargingProfileStatus
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateReq.kt
index 62605c60..f5515648 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.signcertificate
 
+import com.izivia.ocpp.core16.model.Request
+
 data class SignCertificateReq(
     val csr: String
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateResp.kt
index 56dae17c..000378bf 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signcertificate/SignCertificateResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.signcertificate
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.enumeration.GenericStatusEnumType
 
 data class SignCertificateResp(
     val status: GenericStatusEnumType
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationReq.kt
index 18306fd3..aa20dd68 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationReq.kt
@@ -1,8 +1,9 @@
-package com.izivia.ocpp.core16.model.firmwarestatusnotification
+package com.izivia.ocpp.core16.model.signedfirmwarestatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.enumeration.SignedFirmwareStatus
 
 data class SignedFirmwareStatusNotificationReq(
     val status: SignedFirmwareStatus,
     val requestId: Int?
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationResp.kt
index e6477999..612e8814 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedfirmwarestatusnotification/FirmwareStatusNotificationResp.kt
@@ -1,3 +1,5 @@
-package com.izivia.ocpp.core16.model.firmwarestatusnotification
+package com.izivia.ocpp.core16.model.signedfirmwarestatusnotification
 
-class SignedFirmwareStatusNotificationResp
+import com.izivia.ocpp.core16.model.Response
+
+class SignedFirmwareStatusNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareReq.kt
index 6cbf57f2..3e298c91 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareReq.kt
@@ -1,5 +1,6 @@
-package com.izivia.ocpp.core16.model.updatefirmware
+package com.izivia.ocpp.core16.model.signedupdatefirmware
 
+import com.izivia.ocpp.core16.model.Request
 import kotlinx.datetime.Instant
 
 data class SignedUpdateFirmwareReq(
@@ -7,7 +8,7 @@ data class SignedUpdateFirmwareReq(
     val retries: Int?,
     val requestId: Int,
     val retryInterval: Int?
-)
+) : Request
 
 data class FirmwareType(
     val location: String,
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareResp.kt
index 20e8c70c..a86e522c 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/signedupdatefirmware/SignedUpdateFirmwareResp.kt
@@ -1,7 +1,8 @@
-package com.izivia.ocpp.core16.model.updatefirmware
+package com.izivia.ocpp.core16.model.signedupdatefirmware
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.signedupdatefirmware.enumeration.UpdateFirmwareStatusEnumType
 
 data class SignedUpdateFirmwareResp(
     val status: UpdateFirmwareStatusEnumType
-)
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionReq.kt
index ccdee5f9..9109bbfa 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.starttransaction
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.utils.HasActionTimestamp
 import kotlinx.datetime.Instant
 
@@ -9,4 +10,4 @@ data class StartTransactionReq(
     val meterStart: Int,
     override val timestamp: Instant,
     val reservationId: Int? = null
-) : HasActionTimestamp
\ No newline at end of file
+) : HasActionTimestamp, Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionResp.kt
index 3fd50103..4256c871 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/starttransaction/StartTransactionResp.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.starttransaction
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.IdTagInfo
 
 data class StartTransactionResp(
     val idTagInfo: IdTagInfo,
     val transactionId: Int
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationReq.kt
index 1e462f97..bb7c39c9 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.statusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.statusnotification.enumeration.ChargePointErrorCode
 import com.izivia.ocpp.core16.model.statusnotification.enumeration.ChargePointStatus
 import com.izivia.ocpp.utils.HasActionTimestamp
@@ -13,4 +14,4 @@ data class StatusNotificationReq(
     override val timestamp: Instant? = null,
     val vendorErrorCode: String? = null,
     val vendorId: String? = null
-) : HasActionTimestamp
\ No newline at end of file
+) : HasActionTimestamp, Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationResp.kt
index 2155eb5c..0cb06567 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/statusnotification/StatusNotificationResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.statusnotification
 
-class StatusNotificationResp
\ No newline at end of file
+import com.izivia.ocpp.core16.model.Response
+
+class StatusNotificationResp : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionReq.kt
index 36edccc3..4302f21f 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.stoptransaction
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.MeterValue
 import com.izivia.ocpp.core16.model.stoptransaction.enumeration.Reason
 import com.izivia.ocpp.utils.HasActionTimestamp
@@ -12,4 +13,4 @@ data class StopTransactionReq(
     val idTag: String? = null,
     val reason: Reason? = null,
     val transactionData: List<MeterValue>? = null
-) : HasActionTimestamp
\ No newline at end of file
+) : HasActionTimestamp, Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionResp.kt
index 9742fd7a..88b13f88 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/stoptransaction/StopTransactionResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.stoptransaction
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.IdTagInfo
 
 data class StopTransactionResp(
     val idTagInfo: IdTagInfo? = null
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageReq.kt
index 291b4a12..a045b61d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageReq.kt
@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.triggermessage
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.MessageTrigger
 
 data class TriggerMessageReq(
     val requestedMessage: MessageTrigger,
     val connectorId: Int? = null
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageResp.kt
index b2c055c3..c6ffa94d 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/triggermessage/TriggerMessageResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.triggermessage
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.TriggerMessageStatus
 
 data class TriggerMessageResp(
     val status: TriggerMessageStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorReq.kt
index 6cb43691..c2f8f134 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorReq.kt
@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.unlockconnector
 
+import com.izivia.ocpp.core16.model.Request
+
 data class UnlockConnectorReq(
     val connectorId: Int
-)
\ No newline at end of file
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorResp.kt
index 33179ee0..b0d59c85 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/unlockconnector/UnlockConnectorResp.kt
@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.unlockconnector
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.unlockconnector.enumeration.UnlockStatus
 
 data class UnlockConnectorResp(
     val status: UnlockStatus
-)
\ No newline at end of file
+) : Response
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareReq.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareReq.kt
index 0930316c..cd57dbdd 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareReq.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareReq.kt
@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.updatefirmware
 
+import com.izivia.ocpp.core16.model.Request
 import kotlinx.datetime.Instant
 
 data class UpdateFirmwareReq(
@@ -7,4 +8,4 @@ data class UpdateFirmwareReq(
     val retries: Int? = null,
     val retrieveDate: Instant,
     val retryInterval: Int? = null
-)
+) : Request
diff --git a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareResp.kt b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareResp.kt
index 5b4ff5d1..02231528 100644
--- a/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareResp.kt
+++ b/ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/updatefirmware/UpdateFirmwareResp.kt
@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.updatefirmware
 
-class UpdateFirmwareResp
+import com.izivia.ocpp.core16.model.Response
+
+class UpdateFirmwareResp : Response
diff --git a/ocpp-1-6-core/src/test/kotlin/com/izivia/ocpp/core16/test/CoreTest.kt b/ocpp-1-6-core/src/test/kotlin/com/izivia/ocpp/core16/test/CoreTest.kt
index d9dfbda9..8661e429 100644
--- a/ocpp-1-6-core/src/test/kotlin/com/izivia/ocpp/core16/test/CoreTest.kt
+++ b/ocpp-1-6-core/src/test/kotlin/com/izivia/ocpp/core16/test/CoreTest.kt
@@ -1,4 +1,4 @@
-package com.izivia.ocpp.core.test
+package com.izivia.ocpp.core16.test
 
 import com.izivia.ocpp.core16.CSMSOperations
 import com.izivia.ocpp.core16.ChargePointOperations
diff --git a/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapBody.kt b/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapBody.kt
index 6185266f..2f2d178d 100644
--- a/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapBody.kt
+++ b/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapBody.kt
@@ -57,7 +57,7 @@ import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageReq
 import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageResp
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorReq
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorResp
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareReq
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareReq
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareResp
 import com.izivia.ocpp.soap.SoapBody
 import com.izivia.ocpp.soap.SoapFault
diff --git a/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt b/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt
index e9b21c35..7a478b2c 100644
--- a/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt
+++ b/ocpp-1-6-soap/src/main/kotlin/com/izivia/ocpp/soap16/Ocpp16SoapMapper.kt
@@ -87,7 +87,7 @@ import com.izivia.ocpp.core16.model.triggermessage.enumeration.TriggerMessageSta
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorReq
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorResp
 import com.izivia.ocpp.core16.model.unlockconnector.enumeration.UnlockStatus
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareReq
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareReq
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareResp
 import com.izivia.ocpp.soap.*
 import kotlinx.datetime.Instant