diff --git a/src/main/java/com/coveo/pushapiclient/AliasMapping.java b/src/main/java/com/coveo/pushapiclient/AliasMapping.java
index b2be0f92..c43ad1e9 100644
--- a/src/main/java/com/coveo/pushapiclient/AliasMapping.java
+++ b/src/main/java/com/coveo/pushapiclient/AliasMapping.java
@@ -3,7 +3,7 @@
 import java.util.Map;
 
 public class AliasMapping extends IdentityModel {
-    public String provider;
+    public final String provider;
 
     public AliasMapping(String provider, String name, SecurityIdentityType type, Map<String, String> additionalInfo) {
         super(name, type, additionalInfo);
diff --git a/src/main/java/com/coveo/pushapiclient/IdentityModel.java b/src/main/java/com/coveo/pushapiclient/IdentityModel.java
index beb8c8fb..35ec0ddd 100644
--- a/src/main/java/com/coveo/pushapiclient/IdentityModel.java
+++ b/src/main/java/com/coveo/pushapiclient/IdentityModel.java
@@ -3,9 +3,9 @@
 import java.util.Map;
 
 public class IdentityModel {
-    public Map<String, String> additionalInfo;
-    public String name;
-    public SecurityIdentityType type;
+    public final Map<String, String> additionalInfo;
+    public final String name;
+    public final SecurityIdentityType type;
 
     public IdentityModel(String name, SecurityIdentityType type, Map<String, String> additionalInfo) {
         this.name = name;
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityAliasModel.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityAliasModel.java
index 39d7dbcf..c3162943 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityAliasModel.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityAliasModel.java
@@ -1,7 +1,7 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityAliasModel extends SecurityIdentityModelBase {
-    public AliasMapping[] mappings;
+    public final AliasMapping[] mappings;
 
     public SecurityIdentityAliasModel(AliasMapping[] mappings, IdentityModel identity, IdentityModel[] wellKnowns) {
         super(identity, wellKnowns);
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityBatchConfig.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityBatchConfig.java
index 8c445ac5..b11a1a6e 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityBatchConfig.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityBatchConfig.java
@@ -1,8 +1,8 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityBatchConfig {
-    public String fileId;
-    public Long orderingId;
+    public final String fileId;
+    public final Long orderingId;
 
     public SecurityIdentityBatchConfig(String fileId, Long orderingId) {
         this.fileId = fileId;
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityDelete.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityDelete.java
index 3de358c6..322bbc8c 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityDelete.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityDelete.java
@@ -1,7 +1,7 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityDelete {
-    public IdentityModel identity;
+    public final IdentityModel identity;
 
     public SecurityIdentityDelete(IdentityModel identity) {
         this.identity = identity;
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityDeleteOptions.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityDeleteOptions.java
index a46e8aab..8b3d63cd 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityDeleteOptions.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityDeleteOptions.java
@@ -1,8 +1,8 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityDeleteOptions {
-    public Integer queueDelay;
-    public Long orderingId;
+    public final Integer queueDelay;
+    public final Long orderingId;
 
     public SecurityIdentityDeleteOptions(Integer queueDelay, Long orderingId) {
         this.queueDelay = queueDelay;
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityModel.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityModel.java
index 14d2d817..04bf6a21 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityModel.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityModel.java
@@ -1,7 +1,7 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityModel extends SecurityIdentityModelBase {
-    public IdentityModel[] members;
+    public final IdentityModel[] members;
 
     public SecurityIdentityModel(IdentityModel[] members, IdentityModel identity, IdentityModel[] wellKnowns) {
         super(identity, wellKnowns);
diff --git a/src/main/java/com/coveo/pushapiclient/SecurityIdentityModelBase.java b/src/main/java/com/coveo/pushapiclient/SecurityIdentityModelBase.java
index aa55c961..ad1b63b8 100644
--- a/src/main/java/com/coveo/pushapiclient/SecurityIdentityModelBase.java
+++ b/src/main/java/com/coveo/pushapiclient/SecurityIdentityModelBase.java
@@ -1,8 +1,8 @@
 package com.coveo.pushapiclient;
 
 public class SecurityIdentityModelBase {
-    public IdentityModel identity;
-    public IdentityModel[] wellKnowns;
+    public final IdentityModel identity;
+    public final IdentityModel[] wellKnowns;
 
     public SecurityIdentityModelBase(IdentityModel identity, IdentityModel[] wellKnowns) {
         this.identity = identity;