diff --git a/MaLoIdentModels/MaLoIdentModels/DataMarketLocationProperties.cs b/MaLoIdentModels/MaLoIdentModels/DataMarketLocationProperties.cs
index 7429dd5..300323c 100644
--- a/MaLoIdentModels/MaLoIdentModels/DataMarketLocationProperties.cs
+++ b/MaLoIdentModels/MaLoIdentModels/DataMarketLocationProperties.cs
@@ -8,7 +8,7 @@ public class DataMarketLocationProperties
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketLocationProperty")]
     public MarketLocationProperty MarketLocationProperty { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/IdentificationParameter.cs b/MaLoIdentModels/MaLoIdentModels/IdentificationParameter.cs
index 77f6119..d069059 100644
--- a/MaLoIdentModels/MaLoIdentModels/IdentificationParameter.cs
+++ b/MaLoIdentModels/MaLoIdentModels/IdentificationParameter.cs
@@ -8,7 +8,7 @@ public class IdentificationParameter
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonConverter(typeof(DateTimeOffsetWithTrailingZConverter))]
     [JsonPropertyName("identificationDateTime")]
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationDateTime.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationDateTime.cs
index dcc2760..d6a9f8a 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationDateTime.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationDateTime.cs
@@ -8,8 +8,8 @@ namespace MaLoIdentModels;
 public class MarketLocationDateTime
 {
     [JsonIgnore]
-    [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    [Key]
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("maloId")]
     [RegularExpression(@"\d{11}")]
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationMeasuringPointOperator.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationMeasuringPointOperator.cs
index 92e0408..b17f3b6 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationMeasuringPointOperator.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationMeasuringPointOperator.cs
@@ -9,7 +9,7 @@ public class MarketLocationMeasuringPointOperator
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationNetworkOperator.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationNetworkOperator.cs
index b9d8c95..d109e15 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationNetworkOperator.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationNetworkOperator.cs
@@ -9,7 +9,7 @@ public class MarketLocationNetworkOperator
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationProperties.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationProperties.cs
index be788ec..45bdecb 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationProperties.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationProperties.cs
@@ -9,7 +9,7 @@ public class MarketLocationProperties
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonConverter(typeof(JsonStringEnumConverter))]
     [JsonPropertyName("marketLocationProperty")]
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationSupplier.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationSupplier.cs
index cd75d20..750e153 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationSupplier.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationSupplier.cs
@@ -9,7 +9,7 @@ public class MarketLocationSupplier
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/MarketLocationTransmissionSystemOperator.cs b/MaLoIdentModels/MaLoIdentModels/MarketLocationTransmissionSystemOperator.cs
index c5c7526..b11c1b3 100644
--- a/MaLoIdentModels/MaLoIdentModels/MarketLocationTransmissionSystemOperator.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MarketLocationTransmissionSystemOperator.cs
@@ -9,7 +9,7 @@ public class MarketLocationTransmissionSystemOperator
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/MeterLocationMeasuringPointOperator.cs b/MaLoIdentModels/MaLoIdentModels/MeterLocationMeasuringPointOperator.cs
index 39f5750..3a6ac47 100644
--- a/MaLoIdentModels/MaLoIdentModels/MeterLocationMeasuringPointOperator.cs
+++ b/MaLoIdentModels/MaLoIdentModels/MeterLocationMeasuringPointOperator.cs
@@ -9,7 +9,7 @@ public class MeterLocationMeasuringPointOperator
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/NetworkLocationMeasuringPointOperator.cs b/MaLoIdentModels/MaLoIdentModels/NetworkLocationMeasuringPointOperator.cs
index fd7266f..5940059 100644
--- a/MaLoIdentModels/MaLoIdentModels/NetworkLocationMeasuringPointOperator.cs
+++ b/MaLoIdentModels/MaLoIdentModels/NetworkLocationMeasuringPointOperator.cs
@@ -9,7 +9,7 @@ public class NetworkLocationMeasuringPointOperator
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/ResultNegative.cs b/MaLoIdentModels/MaLoIdentModels/ResultNegative.cs
index 9ec395e..a606d28 100644
--- a/MaLoIdentModels/MaLoIdentModels/ResultNegative.cs
+++ b/MaLoIdentModels/MaLoIdentModels/ResultNegative.cs
@@ -6,7 +6,7 @@ namespace MaLoIdentModels;
 public class ResultNegative
 {
     [JsonIgnore]
-    [System.ComponentModel.DataAnnotations.Key]
+    [Key]
     public System.Guid? Id { get; set; }
 
     [JsonPropertyName("decisionTree")]
diff --git a/MaLoIdentModels/MaLoIdentModels/ResultPositive.cs b/MaLoIdentModels/MaLoIdentModels/ResultPositive.cs
index d0f478a..3c3e327 100644
--- a/MaLoIdentModels/MaLoIdentModels/ResultPositive.cs
+++ b/MaLoIdentModels/MaLoIdentModels/ResultPositive.cs
@@ -7,7 +7,7 @@ namespace MaLoIdentModels;
 public class ResultPositive
 {
     [JsonIgnore]
-    [System.ComponentModel.DataAnnotations.Key]
+    [Key]
     public System.Guid? Id { get; set; }
 
     [JsonPropertyName("dataMarketLocation")]
diff --git a/MaLoIdentModels/MaLoIdentModels/SrMarketPartner.cs b/MaLoIdentModels/MaLoIdentModels/SrMarketPartner.cs
index fa0d02b..626ec6d 100644
--- a/MaLoIdentModels/MaLoIdentModels/SrMarketPartner.cs
+++ b/MaLoIdentModels/MaLoIdentModels/SrMarketPartner.cs
@@ -9,7 +9,7 @@ public class SrMarketPartner
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }
diff --git a/MaLoIdentModels/MaLoIdentModels/TrancheSupplier.cs b/MaLoIdentModels/MaLoIdentModels/TrancheSupplier.cs
index 8d8b37e..8eb5592 100644
--- a/MaLoIdentModels/MaLoIdentModels/TrancheSupplier.cs
+++ b/MaLoIdentModels/MaLoIdentModels/TrancheSupplier.cs
@@ -7,7 +7,7 @@ public class TrancheSupplier
 {
     [JsonIgnore]
     [System.ComponentModel.DataAnnotations.Key]
-    public System.Guid? Id { get; set; }
+    public Guid? Id { get; set; }
 
     [JsonPropertyName("marketPartnerId")]
     public long MarketPartnerId { get; set; }