diff --git a/Btms.Backend.Cli/Features/GenerateModels/ClassMaps/Bootstrap.cs b/Btms.Backend.Cli/Features/GenerateModels/ClassMaps/Bootstrap.cs
index 528e7f3..a1a1d5a 100644
--- a/Btms.Backend.Cli/Features/GenerateModels/ClassMaps/Bootstrap.cs
+++ b/Btms.Backend.Cli/Features/GenerateModels/ClassMaps/Bootstrap.cs
@@ -245,7 +245,23 @@ public static void RegisterIpaffsClassMaps()
             map.MapProperty("email").IsSensitive();
             map.MapProperty("ukTelephone").IsSensitive();
             map.MapProperty("telephone").IsSensitive();
-            map.MapProperty("countryISOCode").SetName("countryIsoCode");
+            map.MapProperty("countryISOCode").SetName("countryIsoCode").IsSensitive();
+        });
+
+        GeneratorClassMap.RegisterClassMap("OfficialInspector", map =>
+        {
+            map.MapProperty("firstName").IsSensitive();
+            map.MapProperty("lastName").IsSensitive();
+            map.MapProperty("email").IsSensitive();
+            map.MapProperty("phone").IsSensitive();
+            map.MapProperty("fax").IsSensitive();
+        });
+
+        GeneratorClassMap.RegisterClassMap("NominatedContact", map =>
+        {
+            map.MapProperty("name").IsSensitive();
+            map.MapProperty("email").IsSensitive();
+            map.MapProperty("telephone").IsSensitive();
         });
 
 
diff --git a/Btms.Types.Ipaffs.V1/Address.g.cs b/Btms.Types.Ipaffs.V1/Address.g.cs
index b0376e5..715da5c 100644
--- a/Btms.Types.Ipaffs.V1/Address.g.cs
+++ b/Btms.Types.Ipaffs.V1/Address.g.cs
@@ -88,6 +88,7 @@ public partial class Address  //
         /// country 2-digits ISO code
         /// </summary>
     [JsonPropertyName("countryISOCode")]
+    [Btms.SensitiveData.SensitiveData]
     public string? CountryIsoCode { get; set; }
 
 	
diff --git a/Btms.Types.Ipaffs.V1/NominatedContact.g.cs b/Btms.Types.Ipaffs.V1/NominatedContact.g.cs
index 2ad609e..c20c3a3 100644
--- a/Btms.Types.Ipaffs.V1/NominatedContact.g.cs
+++ b/Btms.Types.Ipaffs.V1/NominatedContact.g.cs
@@ -25,6 +25,7 @@ public partial class NominatedContact  //
         /// Name of nominated contact
         /// </summary>
     [JsonPropertyName("name")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Name { get; set; }
 
 	
@@ -32,6 +33,7 @@ public partial class NominatedContact  //
         /// Email address of nominated contact
         /// </summary>
     [JsonPropertyName("email")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Email { get; set; }
 
 	
@@ -39,6 +41,7 @@ public partial class NominatedContact  //
         /// Telephone number of nominated contact
         /// </summary>
     [JsonPropertyName("telephone")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Telephone { get; set; }
 
 	}
diff --git a/Btms.Types.Ipaffs.V1/OfficialInspector.g.cs b/Btms.Types.Ipaffs.V1/OfficialInspector.g.cs
index 4b7f75b..910b49c 100644
--- a/Btms.Types.Ipaffs.V1/OfficialInspector.g.cs
+++ b/Btms.Types.Ipaffs.V1/OfficialInspector.g.cs
@@ -25,6 +25,7 @@ public partial class OfficialInspector  //
         /// First name of inspector
         /// </summary>
     [JsonPropertyName("firstName")]
+    [Btms.SensitiveData.SensitiveData]
     public string? FirstName { get; set; }
 
 	
@@ -32,6 +33,7 @@ public partial class OfficialInspector  //
         /// Last name of inspector
         /// </summary>
     [JsonPropertyName("lastName")]
+    [Btms.SensitiveData.SensitiveData]
     public string? LastName { get; set; }
 
 	
@@ -39,6 +41,7 @@ public partial class OfficialInspector  //
         /// Email of inspector
         /// </summary>
     [JsonPropertyName("email")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Email { get; set; }
 
 	
@@ -46,6 +49,7 @@ public partial class OfficialInspector  //
         /// Phone number of inspector
         /// </summary>
     [JsonPropertyName("phone")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Phone { get; set; }
 
 	
@@ -53,6 +57,7 @@ public partial class OfficialInspector  //
         /// Fax number of inspector
         /// </summary>
     [JsonPropertyName("fax")]
+    [Btms.SensitiveData.SensitiveData]
     public string? Fax { get; set; }