diff --git a/src/main/java/com/plivo/api/models/maskingsession/MaskingSessionCreator.java b/src/main/java/com/plivo/api/models/maskingsession/MaskingSessionCreator.java
index e492a9c1..8c6e2ecd 100644
--- a/src/main/java/com/plivo/api/models/maskingsession/MaskingSessionCreator.java
+++ b/src/main/java/com/plivo/api/models/maskingsession/MaskingSessionCreator.java
@@ -24,9 +24,9 @@ public class MaskingSessionCreator extends VoiceCreator<MaskingSessionCreateResp
   private boolean generatePin;
   private boolean record;
   private int ringTimeout;
-  private Integer generatePinLength = null;
-  private int pinRetry;
-  private Integer pinRetryWait = null;
+  private Integer generatePinLength;
+  private Integer pinRetry;
+  private Integer pinRetryWait;
   private int sessionExpiry;
   private int callTimeLimit;
   private boolean createSessionWithSingleParty;
@@ -189,10 +189,10 @@ public MaskingSessionCreator generatePinLength(final Integer generatePinLength)
     this.generatePinLength = generatePinLength;
     return this;
   }
-  public int pinRetry() {
+  public Integer pinRetry() {
     return this.pinRetry;
   }
-  public MaskingSessionCreator pinRetry(final int pinRetry) {
+  public MaskingSessionCreator pinRetry(final Integer pinRetry) {
     this.pinRetry = pinRetry;
     return this;
   }