diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
index 8757da352..8e34eff52 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
@@ -39,13 +39,13 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersFromOffice() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "HO")
             public String name;
             @Schema(example = "HO")
             public String nameDecorated;
             @Schema(example = "1")
-            public Integer externalId;
+            public String externalId;
             @Schema(example = "[2009, 1, 1]")
             public LocalDate openingDate;
             @Schema(example = ".")
@@ -57,7 +57,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersFromAccountType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountType.savings")
             public String code;
             @Schema(example = "Savings Account")
@@ -69,7 +69,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersFromOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "HO")
             public String name;
             @Schema(example = "HO")
@@ -81,11 +81,11 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersFromClientOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Small shop")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "HO")
             public String officeName;
         }
@@ -95,7 +95,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersFromAccountTypeOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountType.savings")
             public String code;
             @Schema(example = "Savings Account")
@@ -107,7 +107,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersToOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "HO")
             public String name;
             @Schema(example = "HO")
@@ -119,7 +119,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersToAccountTypeOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountType.savings")
             public String code;
             @Schema(example = "Savings Account")
@@ -145,21 +145,21 @@ final class AccountTransfersApiResourceSwagger {
         private PostAccountTransfersRequest() {}
 
         @Schema(example = "1")
-        public Integer fromOfficeId;
+        public Long fromOfficeId;
         @Schema(example = "1")
-        public Integer fromClientId;
+        public Long fromClientId;
         @Schema(example = "2")
         public Integer fromAccountType;
         @Schema(example = "1")
-        public Integer fromAccountId;
+        public Long fromAccountId;
         @Schema(example = "1")
-        public Integer toOfficeId;
+        public Long toOfficeId;
         @Schema(example = "1")
-        public Integer toClientId;
+        public Long toClientId;
         @Schema(example = "2")
         public Integer toAccountType;
         @Schema(example = "2")
-        public Integer toAccountId;
+        public Long toAccountId;
         @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
         @Schema(example = "en")
@@ -178,9 +178,9 @@ final class AccountTransfersApiResourceSwagger {
         private PostAccountTransfersResponse() {}
 
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetAccountTransfersResponse")
@@ -215,7 +215,7 @@ final class AccountTransfersApiResourceSwagger {
                 private GetAccountTransfersPageItemsFromOffice() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "HO")
                 public String name;
             }
@@ -225,7 +225,7 @@ final class AccountTransfersApiResourceSwagger {
                 private GetAccountTransfersPageItemsFromAccount() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "000000001")
                 public Long accountNo;
             }
@@ -235,7 +235,7 @@ final class AccountTransfersApiResourceSwagger {
                 private GetAccountTransfersPageItemsToAccountType() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "accountType.loan")
                 public String code;
                 @Schema(example = "Loan Account")
@@ -243,7 +243,7 @@ final class AccountTransfersApiResourceSwagger {
             }
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "false")
             public Boolean reversed;
             public GetAccountTransfersPageItemsCurrency currency;
@@ -298,13 +298,13 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferFromOffice() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Head Office")
             public String name;
             @Schema(example = "Head Office")
             public String nameDecorated;
             @Schema(example = "1")
-            public Integer externalId;
+            public String externalId;
             @Schema(example = "[2009, 1, 1]")
             public LocalDate openingDate;
             @Schema(example = ".")
@@ -320,7 +320,7 @@ final class AccountTransfersApiResourceSwagger {
                 private GetAccountTransfersStatus() {}
 
                 @Schema(example = "300")
-                public Integer id;
+                public Long id;
                 @Schema(example = "clientStatusType.active")
                 public String code;
                 @Schema(example = "Active")
@@ -370,7 +370,7 @@ final class AccountTransfersApiResourceSwagger {
             }
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000001")
             public Long accountNo;
             public GetAccountTransfersStatus status;
@@ -388,7 +388,7 @@ final class AccountTransfersApiResourceSwagger {
             public GetAccountTransfersClientType clientType;
             public GetAccountTransfersClientClassification clientClassification;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             public GetAccountTransfersTimeline timeline;
@@ -400,19 +400,19 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferFromAccount() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000002")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "Daniel Owusu")
             public String clientName;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "CTRL")
             public String productName;
             @Schema(example = "0")
-            public Integer fieldOfficerId;
+            public Long fieldOfficerId;
             public GetAccountTransfersTemplateRefundByTransferCurrency currency;
             @Schema(example = "130")
             public Float amtForTransfer;
@@ -423,11 +423,11 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferToClient() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Daniel Owusu")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
         }
@@ -437,19 +437,19 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferToAccount() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000001")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "Daniel Owusu")
             public String clientName;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "TEST")
             public String productName;
             @Schema(example = "0")
-            public Integer fieldOfficerId;
+            public Long fieldOfficerId;
             public GetAccountTransfersTemplateRefundByTransferCurrency currency;
         }
 
@@ -458,7 +458,7 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferFromOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Head Office")
             public String name;
             @Schema(example = "Head Office")
@@ -470,11 +470,11 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferFromClientOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Daniel Owusu")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
         }
@@ -484,19 +484,19 @@ final class AccountTransfersApiResourceSwagger {
             private GetAccountTransfersTemplateRefundByTransferFromAccountOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000002")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "Daniel Owusu")
             public String clientName;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "CTRL")
             public String productName;
             @Schema(example = "0")
-            public Integer fieldOfficerId;
+            public Long fieldOfficerId;
             public GetAccountTransfersTemplateRefundByTransferCurrency currency;
         }
 
@@ -529,17 +529,17 @@ final class AccountTransfersApiResourceSwagger {
         private PostAccountTransfersRefundByTransferRequest() {}
 
         @Schema(example = "2")
-        public Integer fromAccountId;
+        public Long fromAccountId;
         @Schema(example = "1")
         public Integer fromAccountType;
         @Schema(example = "1")
-        public Integer toOfficeId;
+        public Long toOfficeId;
         @Schema(example = "1")
-        public Integer toClientId;
+        public Long toClientId;
         @Schema(example = "2")
         public Integer toAccountType;
         @Schema(example = "1")
-        public Integer toAccountId;
+        public Long toAccountId;
         @Schema(example = "130")
         public Float transferAmount;
         @Schema(example = "31 October 2014")
@@ -551,9 +551,9 @@ final class AccountTransfersApiResourceSwagger {
         @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
         @Schema(example = "1")
-        public Integer fromClientId;
+        public Long fromClientId;
         @Schema(example = "1")
-        public Integer fromOfficeId;
+        public Long fromOfficeId;
     }
 
     @Schema(description = "PostAccountTransfersRefundByTransferResponse")
@@ -562,8 +562,8 @@ final class AccountTransfersApiResourceSwagger {
         private PostAccountTransfersRefundByTransferResponse() {}
 
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
index 207d94531..b2bc885b4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
@@ -47,7 +47,7 @@ final class StandingInstructionApiResourceSwagger {
             @Schema(example = "Head Office")
             public String decoratedName;
             @Schema(example = "1")
-            public Integer externalId;
+            public String externalId;
             @Schema(example = "[2009, 1, 1]")
             public LocalDate openingDate;
             @Schema(example = ".")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
index 8be974be8..049f21910 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
@@ -40,7 +40,7 @@ final class AccountsApiResourceSwagger {
             private GetAccountsTypeProductOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Share Product")
             public String name;
             @Schema(example = "SP")
@@ -50,7 +50,7 @@ final class AccountsApiResourceSwagger {
         }
 
         @Schema(example = "7")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Client Name")
         public String clientName;
         public Set<GetAccountsTypeProductOptions> productOptions;
@@ -66,7 +66,7 @@ final class AccountsApiResourceSwagger {
             private GetAccountsStatus() {}
 
             @Schema(example = "300")
-            public Integer id;
+            public Long id;
             @Schema(example = "shareAccountStatusType.active")
             public String code;
             @Schema(example = "Active")
@@ -132,7 +132,7 @@ final class AccountsApiResourceSwagger {
             private GetAccountsSummary() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000002")
             public Long accountNo;
             @Schema(example = "1")
@@ -140,7 +140,7 @@ final class AccountsApiResourceSwagger {
             @Schema(example = "0")
             public Integer totalPendingForApprovalShares;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "Conflux Share Product")
             public String productName;
             public GetAccountsStatus status;
@@ -157,7 +157,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsPurchasedSharesStatus() {}
 
                 @Schema(example = "300")
-                public Integer id;
+                public Long id;
                 @Schema(example = "purchasedSharesStatusType.approved")
                 public String code;
                 @Schema(example = "Approved")
@@ -169,7 +169,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsPurchasedSharesType() {}
 
                 @Schema(example = "500")
-                public Integer id;
+                public Long id;
                 @Schema(example = "purchasedSharesType.purchased")
                 public String code;
                 @Schema(example = "Purchase")
@@ -177,9 +177,9 @@ final class AccountsApiResourceSwagger {
             }
 
             @Schema(example = "6")
-            public Integer id;
+            public Long id;
             @Schema(example = "2")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "[2016, 4, 1]")
             public LocalDate purchasedDate;
             @Schema(example = "10")
@@ -201,7 +201,7 @@ final class AccountsApiResourceSwagger {
             private GetAccountsLockPeriodTypeEnum() {}
 
             @Schema(example = "0")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.lockin.sharePeriodFrequencyType.days")
             public String code;
             @Schema(example = "Days")
@@ -217,7 +217,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsChargeTimeType() {}
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargeTimeType.activation")
                 public String code;
                 @Schema(example = "Share Account Activate")
@@ -229,7 +229,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsChargeCalculationType() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargeCalculationType.flat")
                 public String code;
                 @Schema(example = "Flat")
@@ -255,11 +255,11 @@ final class AccountsApiResourceSwagger {
             }
 
             @Schema(example = "9")
-            public Integer id;
+            public Long id;
             @Schema(example = "20")
-            public Integer chargeId;
+            public Long chargeId;
             @Schema(example = "2")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "Share Account Activation Flat")
             public String name;
             public GetAccountsChargeTimeType chargeTimeType;
@@ -286,17 +286,17 @@ final class AccountsApiResourceSwagger {
         }
 
         @Schema(example = "2")
-        public Integer id;
+        public Long id;
         @Schema(example = "000000002")
         public Long accountNo;
         @Schema(example = "000000013")
         public Long savingsAccountNumber;
         @Schema(example = "7")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Client_FirstName_2KX8C Client_LastName_NWNG")
         public String clientName;
         @Schema(example = "1")
-        public Integer productId;
+        public Long productId;
         @Schema(example = "Share Product")
         public String productName;
         public GetAccountsStatus status;
@@ -305,7 +305,7 @@ final class AccountsApiResourceSwagger {
         public GetAccountsSummary summary;
         public Set<GetAccountsPurchasedShares> purchasedShares;
         @Schema(example = "13")
-        public Integer savingsAccountId;
+        public Long savingsAccountId;
         @Schema(example = "5")
         public Integer currentMarketPrice;
         @Schema(example = "1")
@@ -335,7 +335,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsTypeStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "shareAccountStatusType.submitted.and.pending.approval")
                 public String code;
                 @Schema(example = "Submitted and pending approval")
@@ -365,7 +365,7 @@ final class AccountsApiResourceSwagger {
                 private GetAccountsTypePurchasedShares() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "01 May 2013")
                 public String purchasedDate;
                 @Schema(example = "10")
@@ -382,15 +382,15 @@ final class AccountsApiResourceSwagger {
             }
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000001")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "Client Name")
             public String clientName;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "Share Product Name")
             public String productName;
             public GetAccountsTypeStatus status;
@@ -415,19 +415,19 @@ final class AccountsApiResourceSwagger {
             private PostAccountsCharges() {}
 
             @Schema(example = "20")
-            public Integer chargeId;
+            public Long chargeId;
             @Schema(example = "1")
             public Integer amount;
         }
 
         @Schema(example = "7")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer productId;
+        public Long productId;
         @Schema(example = "100")
         public Integer requestedShares;
         @Schema(example = "1")
-        public Integer externalId;
+        public String externalId;
         @Schema(example = "01 May 2016")
         public String submittedDate;
         @Schema(example = "1")
@@ -448,7 +448,7 @@ final class AccountsApiResourceSwagger {
         public String dateFormat;
         public Set<PostAccountsCharges> charges;
         @Schema(example = "13")
-        public Integer savingsAccountId;
+        public Long savingsAccountId;
     }
 
     @Schema(description = "PostAccountsTypeResponse")
@@ -457,7 +457,7 @@ final class AccountsApiResourceSwagger {
         private PostAccountsTypeResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PostAccountsTypeAccountIdRequest")
@@ -470,7 +470,7 @@ final class AccountsApiResourceSwagger {
             private PostAccountsRequestedShares() {}
 
             @Schema(example = "35")
-            public Integer id;
+            public Long id;
         }
 
         public Set<PostAccountsRequestedShares> requestedShares;
@@ -482,7 +482,7 @@ final class AccountsApiResourceSwagger {
         private PostAccountsTypeAccountIdResponse() {}
 
         @Schema(example = "5")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutAccountsTypeAccountIdRequest")
@@ -520,7 +520,7 @@ final class AccountsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutAccountsChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/api/EntityFieldConfigurationApiResourcesSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/api/EntityFieldConfigurationApiResourcesSwagger.java
index 8efea61fc..73556ee52 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/api/EntityFieldConfigurationApiResourcesSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/api/EntityFieldConfigurationApiResourcesSwagger.java
@@ -34,7 +34,7 @@ final class EntityFieldConfigurationApiResourcesSwagger {
         private GetFieldConfigurationEntityResponse() {}
 
         @Schema(example = "1")
-        public Integer fieldConfigurationId;
+        public Long fieldConfigurationId;
         @Schema(example = "ADDRESS")
         public String entity;
         @Schema(example = "CLIENT")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
index 177fcd272..5b557fc0a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
@@ -44,9 +44,9 @@ final class ClientAddressApiResourcesSwagger {
         @Schema(example = "Mumbai")
         public String city;
         @Schema(example = "800")
-        public Integer stateProvinceId;
+        public Long stateProvinceId;
         @Schema(example = "802")
-        public Integer countryId;
+        public Long countryId;
         @Schema(example = "400064")
         public Long postalCode;
         @Schema(example = "true")
@@ -59,7 +59,7 @@ final class ClientAddressApiResourcesSwagger {
         private PostClientClientIdAddressesResponse() {}
 
         @Schema(example = "15")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetClientClientIdAddressesResponse")
@@ -72,9 +72,9 @@ final class ClientAddressApiResourcesSwagger {
         @Schema(example = "PERMANENT ADDRESS")
         public String addressType;
         @Schema(example = "14")
-        public Integer addressId;
+        public Long addressId;
         @Schema(example = "804")
-        public Integer addressTypeId;
+        public Long addressTypeId;
         @Schema(example = "false")
         public Boolean isActive;
         @Schema(example = "anki's home")
@@ -92,13 +92,13 @@ final class ClientAddressApiResourcesSwagger {
         @Schema(example = " ")
         public String countyDistrict;
         @Schema(example = "801")
-        public Integer stateProvinceId;
+        public Long stateProvinceId;
         @Schema(example = "UNITED STATES")
         public String countryName;
         @Schema(example = "GUJRAT")
         public String stateName;
         @Schema(example = "807")
-        public Integer countryId;
+        public Long countryId;
         @Schema(example = "400095")
         public Long postalCode;
         @Schema(example = " ")
@@ -113,7 +113,7 @@ final class ClientAddressApiResourcesSwagger {
         private PutClientClientIdAddressesRequest() {}
 
         @Schema(example = "67")
-        public Integer addressId;
+        public Long addressId;
         @Schema(example = "goldensource")
         public String street;
     }
@@ -124,6 +124,6 @@ final class ClientAddressApiResourcesSwagger {
         private PutClientClientIdAddressesResponse() {}
 
         @Schema(example = "67")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
index 0769c0b38..a2d8d57c6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
@@ -82,11 +82,11 @@ final class ClientChargesApiResourceSwagger {
             }
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "5")
-            public Integer chargeId;
+            public Long chargeId;
             @Schema(example = "Client Fee 1")
             public String name;
             public GetClientChargeTimeType chargeTimeType;
@@ -127,7 +127,7 @@ final class ClientChargesApiResourceSwagger {
         @Schema(example = "100")
         public Integer amount;
         @Schema(example = "226")
-        public Integer chargeId;
+        public Long chargeId;
         @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
         @Schema(example = "01 September 2015")
@@ -142,11 +142,11 @@ final class ClientChargesApiResourceSwagger {
         private PostClientsClientIdChargesResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "189")
-        public Integer chargeId;
+        public Long chargeId;
         @Schema(example = "164")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PostClientsClientIdChargesChargeIdRequest")
@@ -172,13 +172,13 @@ final class ClientChargesApiResourceSwagger {
         private PostClientsClientIdChargesChargeIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "189")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "157")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "221")
-        public Integer transactionId;
+        public Long transactionId;
     }
 
     @Schema(description = "DeleteClientsClientIdChargesChargeIdResponse")
@@ -187,10 +187,10 @@ final class ClientChargesApiResourceSwagger {
         private DeleteClientsClientIdChargesChargeIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "189")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "164")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
index 7db6ed6c0..fb69d6f2f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
@@ -38,15 +38,15 @@ final class ClientIdentifiersApiResourceSwagger {
             private GetClientsDocumentType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "Drivers License")
             public String name;
         }
 
         @Schema(example = "2")
-        public Integer id;
+        public Long id;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         public GetClientsDocumentType documentType;
         @Schema(example = "12345")
         public String documentKey;
@@ -64,7 +64,7 @@ final class ClientIdentifiersApiResourceSwagger {
             private GetClientsAllowedDocumentTypes() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Passport")
             public String name;
             @Schema(example = "0")
@@ -80,7 +80,7 @@ final class ClientIdentifiersApiResourceSwagger {
         private PostClientsClientIdIdentifiersRequest() {}
 
         @Schema(example = "1")
-        public Integer documentTypeId;
+        public Long documentTypeId;
         @Schema(example = "KA-54677")
         public String documentKey;
         @Schema(example = "Document has been verified")
@@ -93,7 +93,7 @@ final class ClientIdentifiersApiResourceSwagger {
         private PutClientsClientIdIdentifiersIdentifierIdRequest() {}
 
         @Schema(example = "4")
-        public Integer documentTypeId;
+        public Long documentTypeId;
         @Schema(example = "KA-94667")
         public String documentKey;
         @Schema(example = "Document has been updated")
@@ -106,11 +106,11 @@ final class ClientIdentifiersApiResourceSwagger {
         private PutClientsClientIdIdentifiersIdentifierIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "3")
-        public Integer resourceId;
+        public Long resourceId;
         public PutClientsClientIdIdentifiersIdentifierIdRequest changes;
     }
 
@@ -120,11 +120,11 @@ final class ClientIdentifiersApiResourceSwagger {
         private PostClientsClientIdIdentifiersResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "3")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteClientsClientIdIdentifiersIdentifierIdResponse")
@@ -133,10 +133,10 @@ final class ClientIdentifiersApiResourceSwagger {
         private DeleteClientsClientIdIdentifiersIdentifierIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "3")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
index 6c8c74a3c..9864f7215 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
@@ -44,7 +44,7 @@ final class ClientTransactionsApiResourceSwagger {
                 private GetClientsClientIdTransactionsType() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "clientTransactionType.payCharge")
                 public String code;
                 @Schema(example = "PAY_CHARGE")
@@ -70,9 +70,9 @@ final class ClientTransactionsApiResourceSwagger {
             }
 
             @Schema(example = "226")
-            public Integer id;
+            public Long id;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             public GetClientsClientIdTransactionsType type;
@@ -98,9 +98,9 @@ final class ClientTransactionsApiResourceSwagger {
         private GetClientsClientIdTransactionsTransactionIdResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Head Office")
         public String officeName;
         public GetClientsClientIdTransactionsResponse.GetClientsPageItems.GetClientsClientIdTransactionsType type;
@@ -121,10 +121,10 @@ final class ClientTransactionsApiResourceSwagger {
         private PostClientsClientIdTransactionsTransactionIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "189")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "222")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
index 7766ef070..bf5e6ddb3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
@@ -41,7 +41,7 @@ final class ClientsApiResourceSwagger {
             private GetClientsOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Head Office")
             public String name;
             @Schema(example = "Head Office")
@@ -53,7 +53,7 @@ final class ClientsApiResourceSwagger {
             private GetClientsStaffOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "xyz")
             public String firstname;
             @Schema(example = "sjs")
@@ -61,7 +61,7 @@ final class ClientsApiResourceSwagger {
             @Schema(example = "sjs, xyz")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             @Schema(example = "true")
@@ -75,7 +75,7 @@ final class ClientsApiResourceSwagger {
             private GetClientsSavingProductOptions() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "account overdraft")
             public String name;
             @Schema(example = "false")
@@ -118,7 +118,7 @@ final class ClientsApiResourceSwagger {
         @Schema(example = "[2014, 3, 4]")
         public LocalDate activationDate;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         public Set<GetClientsOfficeOptions> officeOptions;
         public Set<GetClientsStaffOptions> staffOptions;
         public Set<GetClientsSavingProductOptions> savingProductOptions;
@@ -139,7 +139,7 @@ final class ClientsApiResourceSwagger {
                 private GetClientStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "clientStatusType.pending")
                 public String code;
                 @Schema(example = "Pending")
@@ -158,7 +158,7 @@ final class ClientsApiResourceSwagger {
             @Schema(example = "Home Farm Produce")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             @Schema(example = "test@test.com")
@@ -180,7 +180,7 @@ final class ClientsApiResourceSwagger {
             private GetClientsClientIdStatus() {}
 
             @Schema(example = "300")
-            public Integer id;
+            public Long id;
             @Schema(example = "clientStatusType.active")
             public String code;
             @Schema(example = "Active")
@@ -225,7 +225,7 @@ final class ClientsApiResourceSwagger {
         }
 
         @Schema(example = "27")
-        public Integer id;
+        public Long id;
         @Schema(example = "000000027")
         public String accountNo;
         public GetClientsClientIdStatus status;
@@ -240,12 +240,12 @@ final class ClientsApiResourceSwagger {
         @Schema(example = "savings test")
         public String displayName;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Head Office")
         public String officeName;
         public GetClientsTimeline timeline;
         @Schema(example = "4")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "account overdraft")
         public String savingsProductName;
         @Schema(example = "[]")
@@ -285,9 +285,9 @@ final class ClientsApiResourceSwagger {
             @Schema(example = "Mumbai")
             public String city;
             @Schema(example = "800")
-            public Integer stateProvinceId;
+            public Long stateProvinceId;
             @Schema(example = "802")
-            public Integer countryId;
+            public Long countryId;
             @Schema(example = "400064")
             public Long postalCode;
             @Schema(example = "1")
@@ -297,9 +297,9 @@ final class ClientsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer legalFormId;
+        public Long legalFormId;
         @Schema(example = "Client of group")
         public String fullname;
         @Schema(example = "Client_FirstName")
@@ -313,7 +313,7 @@ final class ClientsApiResourceSwagger {
         @Schema(example = "[2013, 1, 1]")
         public LocalDate dateOfBirth;
         @Schema(example = "1")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "dd MMMM yyyy")
         public String dateFormat;
         @Schema(example = "en")
@@ -338,13 +338,13 @@ final class ClientsApiResourceSwagger {
         private PostClientsResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "2")
         public Long clientId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "123-456")
         public String resourceExternalId;
     }
@@ -366,11 +366,11 @@ final class ClientsApiResourceSwagger {
         private PutClientsClientIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "123-456")
         public String resourceExternalId;
         public PutClientsClientIdRequest changes;
@@ -388,11 +388,11 @@ final class ClientsApiResourceSwagger {
         private DeleteClientsClientIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "3")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "3")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "123-456")
         public String resourceExternalId;
     }
@@ -416,11 +416,11 @@ final class ClientsApiResourceSwagger {
         private PostClientsClientIdResponse() {}
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "2")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "123-456")
         public String resourceExternalId;
     }
@@ -475,7 +475,7 @@ final class ClientsApiResourceSwagger {
                 private GetClientsLoanAccountsStatus() {}
 
                 @Schema(example = "300")
-                public Integer id;
+                public Long id;
                 @Schema(example = "loanStatusType.active")
                 public String code;
                 @Schema(example = "Active")
@@ -503,7 +503,7 @@ final class ClientsApiResourceSwagger {
                 private GetClientsLoanAccountsType() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "loanType.individual")
                 public String code;
                 @Schema(example = "Individual")
@@ -511,13 +511,13 @@ final class ClientsApiResourceSwagger {
             }
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000001")
             public String accountNo;
             @Schema(example = "456")
-            public Integer externalId;
+            public String externalId;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "TestOne")
             public String productName;
             public GetClientsLoanAccountsStatus status;
@@ -553,7 +553,7 @@ final class ClientsApiResourceSwagger {
                 private GetClientsSavingsAccountsStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savingsAccountStatusType.submitted.and.pending.approval")
                 public String code;
                 @Schema(example = "Submitted and pending approval")
@@ -585,7 +585,7 @@ final class ClientsApiResourceSwagger {
                 private GetClientsSavingsAccountsDepositType() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "depositAccountType.savingsDeposit")
                 public String code;
                 @Schema(example = "Savings")
@@ -593,11 +593,11 @@ final class ClientsApiResourceSwagger {
             }
 
             @Schema(example = "7")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000007")
             public String accountNo;
             @Schema(example = "2")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "Other product")
             public String productName;
             @Schema(example = "OP")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
index e06eb98b3..4595fac7b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
@@ -38,7 +38,7 @@ final class CollateralsApiResourceSwagger {
             private GetCollateralTypeResponse() {}
 
             @Schema(example = "8")
-            public Integer id;
+            public Long id;
             @Schema(example = "Gold")
             public String name;
         }
@@ -62,7 +62,7 @@ final class CollateralsApiResourceSwagger {
         }
 
         @Schema(example = "12")
-        public Integer id;
+        public Long id;
         public GetCollateralTypeResponse type;
         @Schema(example = "50000")
         public Long value;
@@ -77,7 +77,7 @@ final class CollateralsApiResourceSwagger {
         private PostLoansLoanIdCollateralsRequest() {}
 
         @Schema(example = "9")
-        public Integer collateralTypeId;
+        public Long collateralTypeId;
     }
 
     @Schema(description = "PostLoansLoanIdCollateralsResponse")
@@ -86,7 +86,7 @@ final class CollateralsApiResourceSwagger {
         private PostLoansLoanIdCollateralsResponse() {}
 
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutLoansLoandIdCollateralsCollateralIdRequest")
@@ -104,9 +104,9 @@ final class CollateralsApiResourceSwagger {
         private PutLoansLoanIdCollateralsCollateralIdResponse() {}
 
         @Schema(example = "1")
-        public Integer loanId;
+        public Long loanId;
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
         public PutLoansLoandIdCollateralsCollateralIdRequest changes;
     }
 
@@ -120,7 +120,7 @@ final class CollateralsApiResourceSwagger {
             private GetCollateralsTemplateAllowedTypes() {}
 
             @Schema(example = "9")
-            public Integer id;
+            public Long id;
             @Schema(example = "Silver")
             public String name;
             @Schema(example = "0")
@@ -136,8 +136,8 @@ final class CollateralsApiResourceSwagger {
         private DeleteLoansLoanIdCollateralsCollateralIdResponse() {}
 
         @Schema(example = "1")
-        public Integer loanId;
+        public Long loanId;
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java
index 58501ff92..f80375044 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/ClientCollateralManagementApiResourceSwagger.java
@@ -112,9 +112,9 @@ final class ClientCollateralManagementApiResourceSwagger {
         private PostClientCollateralResponse() {}
 
         @Schema(example = "14")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
 
     }
 
@@ -136,9 +136,9 @@ final class ClientCollateralManagementApiResourceSwagger {
         private PutClientCollateralResponse() {}
 
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         public PutClientCollateralRequest changes;
     }
 
@@ -148,7 +148,7 @@ final class ClientCollateralManagementApiResourceSwagger {
         private DeleteClientCollateralResponse() {}
 
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
 
     }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementApiResourceSwagger.java
index 1f8ebee43..564e7b11b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateralmanagement/api/CollateralManagementApiResourceSwagger.java
@@ -115,7 +115,7 @@ final class CollateralManagementApiResourceSwagger {
         private PostCollateralManagementProductResponse() {}
 
         @Schema(example = "14")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutCollateralProductRequest")
@@ -144,7 +144,7 @@ final class CollateralManagementApiResourceSwagger {
         private PutCollateralProductResponse() {}
 
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
         public CollateralManagementApiResourceSwagger.PutCollateralProductRequest changes;
     }
 
@@ -154,6 +154,6 @@ final class CollateralManagementApiResourceSwagger {
         private DeleteCollateralProductResponse() {}
 
         @Schema(example = "12")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
index b3112730d..74b6f70bb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
@@ -39,11 +39,11 @@ final class CollectionSheetApiResourceSwagger {
             private PostCollectionSheetBulkRepaymentTransactions() {}
 
             @Schema(example = "10")
-            public Integer loanId;
+            public Long loanId;
             @Schema(example = "1221.36")
             public Double transactionAmount;
             @Schema(example = "19")
-            public Integer paymentTypeId;
+            public Long paymentTypeId;
             @Schema(example = "1245356")
             public Long receiptNumber;
         }
@@ -81,9 +81,9 @@ final class CollectionSheetApiResourceSwagger {
         }
 
         @Schema(example = "10")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "10")
-        public Integer resourceId;
+        public Long resourceId;
         public PostCollectionSheetChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java
index 36dcc9c44..65b8ccdcb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java
@@ -31,13 +31,13 @@ public final class DelinquencyApiResourceSwagger {
         private GetDelinquencyRangesResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Delinquent 1")
         public String classification;
         @Schema(example = "1")
-        public Long minimumAgeDays;
+        public Integer minimumAgeDays;
         @Schema(example = "3")
-        public Long maximumAgeDays;
+        public Integer maximumAgeDays;
     }
 
     @Schema(description = "GetDelinquencyBucketsResponse")
@@ -46,7 +46,7 @@ public final class DelinquencyApiResourceSwagger {
         private GetDelinquencyBucketsResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Delinquent Bucket Set 1")
         public String name;
 
@@ -140,7 +140,7 @@ public final class DelinquencyApiResourceSwagger {
         private GetDelinquencyTagHistoryResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "10")
         public Long loanId;
         public GetDelinquencyRangesResponse delinquencyRange;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
index 81d5a88df..db4dfa227 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
@@ -62,7 +62,7 @@ final class FloatingRatesApiResourceSwagger {
         private PostFloatingRatesResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetFloatingRatesResponse")
@@ -71,7 +71,7 @@ final class FloatingRatesApiResourceSwagger {
         private GetFloatingRatesResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Floating Rate 1")
         public String name;
         @Schema(example = "true")
@@ -98,7 +98,7 @@ final class FloatingRatesApiResourceSwagger {
             private GetFloatingRatesRatePeriods() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Dec 15, 2015")
             public String fromDate;
             @Schema(example = "11")
@@ -118,7 +118,7 @@ final class FloatingRatesApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Floating Rate 1")
         public String name;
         @Schema(example = "true")
@@ -163,7 +163,7 @@ final class FloatingRatesApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutFloatingRatesChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/api/FundsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/api/FundsApiResourceSwagger.java
index 2dd3c8b7b..6b54488f2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/api/FundsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/api/FundsApiResourceSwagger.java
@@ -33,7 +33,7 @@ final class FundsApiResourceSwagger {
         private GetFundsResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "EU Agri Fund")
         public String name;
     }
@@ -53,7 +53,7 @@ final class FundsApiResourceSwagger {
         private PostFundsResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutFundsFundIdRequest")
@@ -71,7 +71,7 @@ final class FundsApiResourceSwagger {
         private PutFundsFundIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutFundsFundIdRequest changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
index b72c92229..edfdb4221 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
@@ -39,7 +39,7 @@ final class CentersApiResourceSwagger {
             private GetCentersOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Head Office")
             public String name;
             @Schema(example = "Head Office")
@@ -51,7 +51,7 @@ final class CentersApiResourceSwagger {
             private GetCentersStaffOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "D, Mary")
             public String displayName;
         }
@@ -61,7 +61,7 @@ final class CentersApiResourceSwagger {
         @Schema(example = "[2013, 4, 18]")
         public LocalDate activationDate;
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         public Set<GetCentersOfficeOptions> officeOptions;
         public Set<GetCentersStaffOptions> staffOptions;
     }
@@ -80,7 +80,7 @@ final class CentersApiResourceSwagger {
                 private GetCentersStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "groupingStatusType.pending")
                 public String code;
                 @Schema(example = "Pending")
@@ -88,14 +88,14 @@ final class CentersApiResourceSwagger {
             }
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             public GetCentersStatus status;
             @Schema(example = "false")
             public Boolean active;
             @Schema(example = "Center 1")
             public String name;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             @Schema(example = ".2.")
@@ -113,14 +113,14 @@ final class CentersApiResourceSwagger {
         private GetCentersCenterIdResponse() {}
 
         @Schema(example = "8")
-        public Integer id;
+        public Long id;
         public GetCentersResponse.GetCentersPageItems.GetCentersStatus status;
         @Schema(example = "false")
         public Boolean active;
         @Schema(example = "First Center (No groups)")
         public String name;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Head Office")
         public String officeName;
         @Schema(example = ".8.")
@@ -135,7 +135,7 @@ final class CentersApiResourceSwagger {
         @Schema(example = "First Center (No groups)")
         public String name;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "false")
         public Boolean active;
     }
@@ -146,11 +146,11 @@ final class CentersApiResourceSwagger {
         private PostCentersResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "8")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "8")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutCentersCenterIdRequest")
@@ -176,11 +176,11 @@ final class CentersApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "8")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "8")
-        public Integer resourceId;
+        public Long resourceId;
         public PutCentersChanges changes;
     }
 
@@ -195,7 +195,7 @@ final class CentersApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public DeleteCentersChanges changes;
     }
 
@@ -205,7 +205,7 @@ final class CentersApiResourceSwagger {
         private PostCentersCenterIdRequest() {}
 
         @Schema(example = "32")
-        public Integer closureReasonId;
+        public Long closureReasonId;
         @Schema(example = "05 May 2014")
         public String closureDate;
         @Schema(example = "en")
@@ -220,7 +220,7 @@ final class CentersApiResourceSwagger {
         private PostCentersCenterIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetCentersCenterIdAccountsResponse")
@@ -237,7 +237,7 @@ final class CentersApiResourceSwagger {
                 private GetCentersCenterIdStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savingsAccountStatusType.submitted.and.pending.approval")
                 public String code;
                 @Schema(example = "Submitted and pending approval")
@@ -287,7 +287,7 @@ final class CentersApiResourceSwagger {
                 private GetCentersAccountType() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "accountType.group")
                 public String code;
                 @Schema(example = "Group")
@@ -313,7 +313,7 @@ final class CentersApiResourceSwagger {
                 private GetCentersDepositType() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "depositAccountType.savingsDeposit")
                 public String code;
                 @Schema(example = "Savings")
@@ -321,11 +321,11 @@ final class CentersApiResourceSwagger {
             }
 
             @Schema(example = "16")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000016")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "Voluntary savings")
             public String productName;
             public GetCentersCenterIdStatus status;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
index 03a5e32c1..8f27280b3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
@@ -39,7 +39,7 @@ final class GroupsApiResourceSwagger {
             private GetGroupsTemplateOfficeOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Head Office")
             public String name;
             @Schema(example = "Head Office")
@@ -51,7 +51,7 @@ final class GroupsApiResourceSwagger {
             private GetGroupsTemplateStaffOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "C, Mike")
             public String displayName;
         }
@@ -61,11 +61,11 @@ final class GroupsApiResourceSwagger {
             private GetGroupsTemplateClientOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Petra Yton")
             public String displayName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
         }
@@ -106,7 +106,7 @@ final class GroupsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         public Set<GetGroupsTemplateOfficeOptions> officeOptions;
         public Set<GetGroupsTemplateStaffOptions> staffOptions;
         public Set<GetGroupsTemplateClientOptions> clientOptions;
@@ -127,7 +127,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "clientStatusType.pending")
                 public String code;
                 @Schema(example = "Pending")
@@ -135,14 +135,14 @@ final class GroupsApiResourceSwagger {
             }
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "AnotherGroup")
             public String name;
             public GetGroupsStatus status;
             @Schema(example = "false")
             public Boolean active;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "Head Office")
             public String officeName;
             @Schema(example = ".4.")
@@ -174,13 +174,13 @@ final class GroupsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "First Group")
         public String name;
         @Schema(example = "000-1A")
         public String externalId;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Head Office")
         public String officeName;
         @Schema(example = ".1.")
@@ -194,7 +194,7 @@ final class GroupsApiResourceSwagger {
         private PostGroupsRequest() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Pending Group")
         public String name;
         @Schema(example = "false")
@@ -207,11 +207,11 @@ final class GroupsApiResourceSwagger {
         private PostGroupsResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "2")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteGroupsGroupIdResponse")
@@ -220,11 +220,11 @@ final class GroupsApiResourceSwagger {
         private DeleteGroupsGroupIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "2")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PostGroupsGroupIdCommandUnassignStaffRequest")
@@ -233,7 +233,7 @@ final class GroupsApiResourceSwagger {
         private PostGroupsGroupIdCommandUnassignStaffRequest() {}
 
         @Schema(example = "1")
-        public Integer staffId;
+        public Long staffId;
     }
 
     @Schema(description = "PostGroupsGroupIdCommandUnassignStaffResponse")
@@ -247,11 +247,11 @@ final class GroupsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PostGroupsGroupIdCommandUnassignStaffChanges changes;
     }
 
@@ -278,11 +278,11 @@ final class GroupsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer groupId;
+        public Long groupId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutGroupsGroupIdChanges changes;
     }
 
@@ -300,7 +300,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "loanStatusType.submitted.and.pending.approval")
                 public String code;
                 @Schema(example = "Submitted and pending approval")
@@ -328,7 +328,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsLoanType() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "accountType.group")
                 public String code;
                 @Schema(example = "Group")
@@ -336,11 +336,11 @@ final class GroupsApiResourceSwagger {
             }
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000003")
             public Long accountNo;
             @Schema(example = "3")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "daily product")
             public String productName;
             public GetGroupsGroupIdAccountsStatus status;
@@ -356,7 +356,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsSavingStatus() {}
 
                 @Schema(example = "100")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savingsAccountStatusType.submitted.and.pending.approval")
                 public String code;
                 @Schema(example = "Submitted and pending approval")
@@ -398,7 +398,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsSavingAccountType() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "accountType.group")
                 public String code;
                 @Schema(example = "Group")
@@ -406,11 +406,11 @@ final class GroupsApiResourceSwagger {
             }
 
             @Schema(example = "9")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000009")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "p_sav")
             public String productName;
             public GetGroupsGroupIdAccountsSavingStatus status;
@@ -427,7 +427,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsMemberLoanStatus() {}
 
                 @Schema(example = "200")
-                public Integer id;
+                public Long id;
                 @Schema(example = "loanStatusType.approved")
                 public String code;
                 @Schema(example = "Approved")
@@ -455,7 +455,7 @@ final class GroupsApiResourceSwagger {
                 private GetGroupsGroupIdAccountsMemberLoanType() {}
 
                 @Schema(example = "3")
-                public Integer id;
+                public Long id;
                 @Schema(example = "accountType.jlg")
                 public String code;
                 @Schema(example = "JLG")
@@ -463,11 +463,11 @@ final class GroupsApiResourceSwagger {
             }
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000004")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "testLoan")
             public String productName;
             public GetGroupsGroupIdAccountsMemberLoanStatus status;
@@ -479,11 +479,11 @@ final class GroupsApiResourceSwagger {
             private GetGroupsGroupIdAccountsMemberSavingsAccounts() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "000000003")
             public Long accountNo;
             @Schema(example = "1")
-            public Integer productId;
+            public Long productId;
             @Schema(example = "p_sav")
             public String productName;
             public GetGroupsGroupIdAccountsSavingAccounts.GetGroupsGroupIdAccountsSavingStatus status;
@@ -507,11 +507,11 @@ final class GroupsApiResourceSwagger {
             private PostGroupsGroupIdClients() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
         }
 
         @Schema(example = "2")
-        public Integer destinationGroupId;
+        public Long destinationGroupId;
         public Set<PostGroupsGroupIdClients> clients;
     }
 
@@ -521,6 +521,6 @@ final class GroupsApiResourceSwagger {
         private PostGroupsGroupIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
index 2cbe318f2..d3b1c9ab1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
@@ -19,6 +19,7 @@
 package org.apache.fineract.portfolio.interestratechart.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.util.Set;
 
 /**
@@ -42,7 +43,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 private GetInterestRateChartsChartIdChartSlabsEntityType() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "InterestIncentiveEntityType.customer")
                 public Integer code;
                 @Schema(example = "Customer")
@@ -54,7 +55,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 private GetInterestRateChartsChartIdChartSlabsAttributeName() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "InterestIncentiveAttributeName.gender")
                 public Integer code;
                 @Schema(example = "Gender")
@@ -66,7 +67,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 private GetInterestRateChartsChartIdChartSlabsConditionType() {}
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "incentiveConditionType.equal")
                 public Integer code;
                 @Schema(example = "equal")
@@ -78,7 +79,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 private GetInterestRateChartsChartIdChartSlabsIncentiveType() {}
 
                 @Schema(example = "3")
-                public Integer id;
+                public Long id;
                 @Schema(example = "InterestIncentiveType.incentive")
                 public Integer code;
                 @Schema(example = "Incentive")
@@ -86,7 +87,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
             }
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             public GetInterestRateChartsChartIdChartSlabsEntityType entityType;
             public GetInterestRateChartsChartIdChartSlabsAttributeName attributeName;
             public GetInterestRateChartsChartIdChartSlabsConditionType conditionType;
@@ -100,7 +101,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "5% interest from 1 day till 180 days of deposit")
         public String description;
         public InterestRateChartsApiResourceSwagger.GetInterestRateChartsTemplateResponse.GetInterestRateChartsTemplatePeriodTypes periodTypes;
@@ -130,11 +131,11 @@ final class InterestRateChartSlabsApiResourceSwagger {
             @Schema(example = "2")
             public Integer conditionType;
             @Schema(example = "11")
-            public Integer attributeValue;
+            public String attributeValue;
             @Schema(example = "2")
             public Integer incentiveType;
             @Schema(example = "-1")
-            public Float amount;
+            public BigDecimal amount;
         }
 
         @Schema(example = "0")
@@ -158,7 +159,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
         private PostInterestRateChartsChartIdChartSlabsResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutInterestRateChartsChartIdChartSlabsChartSlabIdRequest")
@@ -178,7 +179,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
         private PutInterestRateChartsChartIdChartSlabsChartSlabIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutInterestRateChartsChartIdChartSlabsChartSlabIdRequest changes;
     }
 
@@ -188,6 +189,6 @@ final class InterestRateChartSlabsApiResourceSwagger {
         private DeleteInterestRateChartsChartIdChartSlabsResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
index b7811aaf6..b0feeca8e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
@@ -59,7 +59,7 @@ final class InterestRateChartsApiResourceSwagger {
             private GetInterestRateChartsChartSlabs() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             public GetInterestRateChartsTemplateResponse.GetInterestRateChartsTemplatePeriodTypes periodTypes;
             @Schema(example = "1")
             public Integer fromPeriod;
@@ -87,11 +87,11 @@ final class InterestRateChartsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "[2014, 1, 1]")
         public LocalDate fromDate;
         @Schema(example = "1")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "Fixed Deposit Product 001")
         public String savingsProductName;
         public Set<GetInterestRateChartsChartSlabs> chartSlabs;
@@ -122,7 +122,7 @@ final class InterestRateChartsApiResourceSwagger {
         private PostInterestRateChartsResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutInterestRateChartsChartIdRequest")
@@ -142,7 +142,7 @@ final class InterestRateChartsApiResourceSwagger {
         private PutInterestRateChartsChartIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteInterestRateChartsChartIdResponse")
@@ -151,6 +151,6 @@ final class InterestRateChartsApiResourceSwagger {
         private DeleteInterestRateChartsChartIdResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
index 8d6edb9d3..9a3f46bea 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
@@ -48,7 +48,7 @@ final class LoanScheduleApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer loanId;
+        public Long loanId;
         public PostLoanChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
index d71e4659a..33ed6e2b0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
@@ -276,7 +276,7 @@ final class LoanTransactionsApiResourceSwagger {
         @Schema(example = "ban123")
         public String bankNumber;
         @Schema(example = "3")
-        public Integer loanChargeId;
+        public Long loanChargeId;
         @Schema(example = "28 June 2022")
         public String dueDate;
         @Schema(example = "1")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
index b27bccbf7..a011f28f6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
@@ -63,7 +63,7 @@ final class LoansApiResourceSwagger {
             private GetLoansTemplateProductOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Kampala Product (with cash accounting)")
             public String name;
         }
@@ -73,7 +73,7 @@ final class LoansApiResourceSwagger {
         @Schema(example = "Kampala first Client")
         public String clientName;
         @Schema(example = "2")
-        public Integer clientOfficeId;
+        public Long clientOfficeId;
         public GetLoansTemplateTimeline timeline;
         public Set<GetLoansTemplateProductOptions> productOptions;
     }
@@ -88,7 +88,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdStatus() {}
 
             @Schema(example = "300")
-            public Integer id;
+            public Long id;
             @Schema(example = "loanStatusType.active")
             public String code;
             @Schema(example = "Active")
@@ -116,7 +116,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdLoanType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "loanType.individual")
             public String code;
             @Schema(example = "Individual")
@@ -146,7 +146,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdTermPeriodFrequencyType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "termFrequency.periodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -158,7 +158,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdRepaymentFrequencyType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "repaymentFrequency.periodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -170,7 +170,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdInterestRateFrequencyType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "interestRateFrequency.periodFrequencyType.years")
             public String code;
             @Schema(example = "Per year")
@@ -182,7 +182,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdAmortizationType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "amortizationType.equal.installments")
             public String code;
             @Schema(example = "Equal installments")
@@ -194,7 +194,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdInterestType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "interestType.flat")
             public String code;
             @Schema(example = "Flat")
@@ -206,7 +206,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdInterestCalculationPeriodType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "interestCalculationPeriodType.same.as.repayment.period")
             public String code;
             @Schema(example = "Same as repayment period")
@@ -384,7 +384,7 @@ final class LoansApiResourceSwagger {
             private GetLoansLoanIdDisbursementDetails() {}
 
             @Schema(example = "71")
-            public Integer id;
+            public Long id;
             @Schema(example = "[2022, 07, 01]")
             public LocalDate expectedDisbursementDate;
             @Schema(example = "[2022, 07, 01]")
@@ -421,7 +421,7 @@ final class LoansApiResourceSwagger {
                 private GetLoansLoanIdLinkedAccount() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "000000001")
                 public String accountNo;
             }
@@ -435,7 +435,7 @@ final class LoansApiResourceSwagger {
                     private GetLoansLoanIdChargeTimeType() {}
 
                     @Schema(example = "9")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "chargeTimeType.overdueInstallment")
                     public String code;
                     @Schema(example = "overdue fees")
@@ -447,7 +447,7 @@ final class LoansApiResourceSwagger {
                     private GetLoansLoanIdChargeCalculationType() {}
 
                     @Schema(example = "2")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "chargeCalculationType.percent.of.amount")
                     public String code;
                     @Schema(example = "% Amount")
@@ -459,7 +459,7 @@ final class LoansApiResourceSwagger {
                     private GetLoansLoanIdChargePaymentMode() {}
 
                     @Schema(example = "0")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "chargepaymentmode.regular")
                     public String code;
                     @Schema(example = "Regular")
@@ -471,7 +471,7 @@ final class LoansApiResourceSwagger {
                     private GetLoansLoanIdFeeFrequency() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "feeFrequencyperiodFrequencyType.weeks")
                     public String code;
                     @Schema(example = "Weeks")
@@ -479,7 +479,7 @@ final class LoansApiResourceSwagger {
                 }
 
                 @Schema(example = "20")
-                public Integer id;
+                public Long id;
                 @Schema(example = "overdraft penality")
                 public String name;
                 @Schema(example = "true")
@@ -842,7 +842,7 @@ final class LoansApiResourceSwagger {
             @Schema(example = "[2022, 07, 01]")
             public LocalDate transactionDate;
             @Schema(example = "101")
-            public Long paymentTypeId;
+            public Integer paymentTypeId;
             @Schema(example = "acct123")
             public String accountNumber;
             @Schema(example = "10001")
@@ -1000,25 +1000,25 @@ final class LoansApiResourceSwagger {
         @Schema(example = "false")
         public boolean disallowExpectedDisbursements;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "5e77989e-aa11-11bc-b109-0242ac120004")
         public String clientExternalId;
         @Schema(example = "Kampala first Client")
         public String clientName;
         @Schema(example = "2")
-        public Integer clientOfficeId;
+        public Long clientOfficeId;
         @Schema(example = "1")
-        public Integer loanProductId;
+        public Long loanProductId;
         @Schema(example = "Kampala Product (with cash accounting)")
         public String loanProductName;
         @Schema(example = "Typical Kampala loan product with cash accounting enabled for testing.")
         public String loanProductDescription;
         @Schema(example = "22")
-        public Integer loanPurposeId;
+        public Long loanPurposeId;
         @Schema(example = "option.HousingImprovement")
         public String loanPurposeName;
         @Schema(example = "2")
-        public Integer loanOfficerId;
+        public Long loanOfficerId;
         @Schema(example = "LoanOfficer, Kampala")
         public String loanOfficerName;
         public GetLoansLoanIdLoanType loanType;
@@ -1231,9 +1231,9 @@ final class LoansApiResourceSwagger {
         public Long totalOutstanding;
         public Set<PostLoansRepaymentSchedulePeriods> periods;
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
         public Long loanId;
         @Schema(example = "1")
@@ -1386,9 +1386,9 @@ final class LoansApiResourceSwagger {
         }
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
         public Long loanId;
         @Schema(example = "1")
@@ -1404,9 +1404,9 @@ final class LoansApiResourceSwagger {
         private DeleteLoansLoanIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
         public Long loanId;
         @Schema(example = "1")
@@ -1477,7 +1477,7 @@ final class LoansApiResourceSwagger {
             private PostLoansLoanIdStatus() {}
 
             @Schema(example = "300")
-            public Integer id;
+            public Long id;
             @Schema(example = "loanStatusType.approved")
             public String code;
             @Schema(example = "Approved")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/api/RescheduleLoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/api/RescheduleLoansApiResourceSwagger.java
index 1f1840cde..cf704ba69 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/api/RescheduleLoansApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/api/RescheduleLoansApiResourceSwagger.java
@@ -40,7 +40,7 @@ final class RescheduleLoansApiResourceSwagger {
             private GetRescheduleReasonsAllowedTypes() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "reason")
             public String name;
             @Schema(example = "0")
@@ -66,7 +66,7 @@ final class RescheduleLoansApiResourceSwagger {
             private GetLoanRescheduleRequestStatus() {}
 
             @Schema(example = "100")
-            public Integer id;
+            public Long id;
             @Schema(example = "loanStatusType.submitted.and.pending.approval")
             public String code;
             @Schema(example = "Submitted and pending approval")
@@ -84,7 +84,7 @@ final class RescheduleLoansApiResourceSwagger {
             private RescheduleReasonsCodeValue() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "reason")
             public String name;
             @Schema(example = "true")
@@ -120,7 +120,7 @@ final class RescheduleLoansApiResourceSwagger {
             private LoanTermTypeOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "loanTermType.dueDate")
             public String code;
             @Schema(example = "dueDate")
@@ -132,7 +132,7 @@ final class RescheduleLoansApiResourceSwagger {
             private LoanTermVariationsData() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             public LoanTermTypeOptions termType;
             @Schema(example = "[2022, 5, 1]")
             public LocalDate termVariationApplicableFrom;
@@ -148,11 +148,11 @@ final class RescheduleLoansApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "18")
-        public Integer loanId;
+        public Long loanId;
         @Schema(example = "15")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "clientName")
         public String clientName;
         @Schema(example = "000000018")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
index 00fe829a3..cd9a28ed2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
@@ -102,7 +102,7 @@ final class LoanProductsApiResourceSwagger {
         @Schema(example = "false")
         public Boolean useBorrowerCycle;
         @Schema(example = "2")
-        public Integer repaymentFrequencyType;
+        public Long repaymentFrequencyType;
         @Schema(example = "2")
         public Integer interestRateFrequencyType;
         @Schema(example = "1")
@@ -1351,9 +1351,9 @@ final class LoanProductsApiResourceSwagger {
         @Schema(example = "50")
         public Integer overAppliedNumber;
         @Schema(example = "1")
-        public Integer daysInMonthType;
+        public Long daysInMonthType;
         @Schema(example = "1")
-        public Integer daysInYearType;
+        public Long daysInYearType;
         @Schema(example = "true")
         public Boolean allowPartialPeriodInterestCalcualtion;
         @Schema(example = "179")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
index e6d2b71e7..11e7e22db 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
@@ -38,7 +38,7 @@ public final class NotesApiResourceSwagger {
             private GetNotesNoteType() {}
 
             @Schema(example = "100")
-            public Integer id;
+            public Long id;
             @Schema(example = "noteType.client")
             public String code;
             @Schema(example = "Client note")
@@ -46,20 +46,20 @@ public final class NotesApiResourceSwagger {
         }
 
         @Schema(example = "2")
-        public Integer id;
+        public Long id;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         public GetNotesNoteType noteType;
         @Schema(example = "First note edited")
         public String note;
         @Schema(example = "1")
-        public Integer createdById;
+        public Long createdById;
         @Schema(example = "mifos")
         public String createdByUsername;
         @Schema(example = "1342498505000")
         public ZonedDateTime createdOn;
         @Schema(example = "1")
-        public Integer updatedById;
+        public Long updatedById;
         @Schema(example = "mifos")
         public String updatedByUsername;
         @Schema(example = "1342498517000")
@@ -72,20 +72,20 @@ public final class NotesApiResourceSwagger {
         private GetResourceTypeResourceIdNotesNoteIdResponse() {}
 
         @Schema(example = "76")
-        public Integer id;
+        public Long id;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         public GetResourceTypeResourceIdNotesResponse.GetNotesNoteType noteType;
         @Schema(example = "a note about the client")
         public String note;
         @Schema(example = "1")
-        public Integer createdById;
+        public Long createdById;
         @Schema(example = "mifos")
         public String createdByUsername;
         @Schema(example = "1359463135000")
         public ZonedDateTime createdOn;
         @Schema(example = "1")
-        public Integer updatedById;
+        public Long updatedById;
         @Schema(example = "mifos")
         public String updatedByUsername;
         @Schema(example = "1359463135000")
@@ -107,9 +107,9 @@ public final class NotesApiResourceSwagger {
         private PostResourceTypeResourceIdNotesResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "76")
         public Integer resourceId;
     }
@@ -137,9 +137,9 @@ public final class NotesApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "76")
         public Integer resourceId;
         public PutNotesChanges changes;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
index 22f7d490b..4dbe212ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
@@ -58,7 +58,7 @@ final class ProductsApiResourceSwagger {
             private GetProductsMarketPrice() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "Feb 1, 2016")
             public String fromDate;
             @Schema(example = "1")
@@ -92,7 +92,7 @@ final class ProductsApiResourceSwagger {
                 private GetChargeTimeType() {}
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargeTimeType.activation")
                 public String code;
                 @Schema(example = "Share Account Activate")
@@ -104,7 +104,7 @@ final class ProductsApiResourceSwagger {
                 private GetChargeAppliesTo() {}
 
                 @Schema(example = "4")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargeAppliesTo.shares")
                 public String code;
                 @Schema(example = "Shares")
@@ -116,7 +116,7 @@ final class ProductsApiResourceSwagger {
                 private GetChargeCalculationType() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargeCalculationType.flat")
                 public String code;
                 @Schema(example = "Flat")
@@ -128,7 +128,7 @@ final class ProductsApiResourceSwagger {
                 private GetChargePaymentMode() {}
 
                 @Schema(example = "0")
-                public Integer id;
+                public Long id;
                 @Schema(example = "chargepaymentmode.regular")
                 public String code;
                 @Schema(example = "Regular")
@@ -136,7 +136,7 @@ final class ProductsApiResourceSwagger {
             }
 
             @Schema(example = "20")
-            public Integer id;
+            public Long id;
             @Schema(example = "Share Account Activation Flat")
             public String name;
             @Schema(example = "true")
@@ -157,7 +157,7 @@ final class ProductsApiResourceSwagger {
             private GetLockPeriodTypeEnum() {}
 
             @Schema(example = "0")
-            public Integer id;
+            public Long id;
             @Schema(example = "Days")
             public String description;
         }
@@ -167,7 +167,7 @@ final class ProductsApiResourceSwagger {
             private GetProductsAccountingRule() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountingRuleType.cash")
             public String code;
             @Schema(example = "CASH BASED")
@@ -183,7 +183,7 @@ final class ProductsApiResourceSwagger {
                 private GetShareReferenceId() {}
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "ASSET_ED1461237837829")
@@ -195,7 +195,7 @@ final class ProductsApiResourceSwagger {
                 private GetIncomeFromFeeAccountId() {}
 
                 @Schema(example = "14")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "INCOME_OY1461237869836")
@@ -207,7 +207,7 @@ final class ProductsApiResourceSwagger {
                 private GetShareEquityId() {}
 
                 @Schema(example = "66")
-                public Integer id;
+                public Long id;
                 @Schema(example = "Equity Account")
                 public String name;
                 @Schema(example = "EQUITY1")
@@ -219,7 +219,7 @@ final class ProductsApiResourceSwagger {
                 private GetShareSuspenseId() {}
 
                 @Schema(example = "8")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "LIABILITY_MA1461237860198")
@@ -237,7 +237,7 @@ final class ProductsApiResourceSwagger {
             private GetProductsMinimumActivePeriodFrequencyTypeOptions() {}
 
             @Schema(example = "0")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.lockin.sharePeriodFrequencyType.days")
             public String code;
             @Schema(example = "Days")
@@ -257,7 +257,7 @@ final class ProductsApiResourceSwagger {
                     private GetProductsLiabilityType() {}
 
                     @Schema(example = "2")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "accountType.liability")
                     public String code;
                     @Schema(example = "LIABILITY")
@@ -269,7 +269,7 @@ final class ProductsApiResourceSwagger {
                     private GetProductsLiabilityUsage() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "accountUsage.detail")
                     public String code;
                     @Schema(example = "DETAIL")
@@ -281,13 +281,13 @@ final class ProductsApiResourceSwagger {
                     private GetProductsTagId() {}
 
                     @Schema(example = "0")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "false")
                     public Boolean isActive;
                 }
 
                 @Schema(example = "4")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "LIABILITY_2T1461237838897")
@@ -314,7 +314,7 @@ final class ProductsApiResourceSwagger {
                     private GetAssetType() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "accountType.asset")
                     public String code;
                     @Schema(example = "ASSET")
@@ -322,7 +322,7 @@ final class ProductsApiResourceSwagger {
                 }
 
                 @Schema(example = "1")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "ASSET_ED1461237837829")
@@ -349,7 +349,7 @@ final class ProductsApiResourceSwagger {
                     private GetIncomeType() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "accountType.income")
                     public String code;
                     @Schema(example = "INCOME")
@@ -357,7 +357,7 @@ final class ProductsApiResourceSwagger {
                 }
 
                 @Schema(example = "2")
-                public Integer id;
+                public Long id;
                 @Schema(example = "ACCOUNT_NAME_1FJBQ")
                 public String name;
                 @Schema(example = "INCOME_9O1461237838422")
@@ -384,7 +384,7 @@ final class ProductsApiResourceSwagger {
                     private GetEquityType() {}
 
                     @Schema(example = "3")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "accountType.equity")
                     public String code;
                     @Schema(example = "EQUITY")
@@ -392,7 +392,7 @@ final class ProductsApiResourceSwagger {
                 }
 
                 @Schema(example = "66")
-                public Integer id;
+                public Long id;
                 @Schema(example = "Equity Account")
                 public String name;
                 @Schema(example = "EQUITY1")
@@ -415,7 +415,7 @@ final class ProductsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Share Product")
         public String name;
         @Schema(example = "SP")
@@ -466,7 +466,7 @@ final class ProductsApiResourceSwagger {
             private GetProductsPageItems() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Share Product")
             public String name;
             @Schema(example = "Share Product Description")
@@ -504,7 +504,7 @@ final class ProductsApiResourceSwagger {
             private PostProductsChargesSelected() {}
 
             @Schema(example = "20")
-            public Integer id;
+            public Long id;
         }
 
         @Schema(example = "Share Product")
@@ -555,7 +555,7 @@ final class ProductsApiResourceSwagger {
         private PostProductsTypeResponse() {}
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutProductsTypeProductIdRequest")
@@ -589,7 +589,7 @@ final class ProductsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutProductsChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
index cd3547582..3249c2b81 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
@@ -39,13 +39,13 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsProductOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Passbook Savings")
             public String name;
         }
 
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "small business")
         public String clientName;
         public Set<GetFixedDepositAccountsProductOptions> productOptions;
@@ -61,7 +61,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsStatus() {}
 
             @Schema(example = "100")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsAccountStatusType.submitted.and.pending.approval")
             public String code;
             @Schema(example = "Submitted and pending approval")
@@ -125,7 +125,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsInterestCompoundingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.period.savingsCompoundingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -137,7 +137,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsInterestPostingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.posting.period.savingsPostingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -149,7 +149,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsInterestCalculationType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationType.dailybalance")
             public String code;
             @Schema(example = "Daily Balance")
@@ -161,7 +161,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsInterestCalculationDaysInYearType() {}
 
             @Schema(example = "365")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationDaysInYearType.days365")
             public String code;
             @Schema(example = "365 Days")
@@ -182,7 +182,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsMinDepositTermType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -194,7 +194,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsMaxDepositTermType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.years")
             public String code;
             @Schema(example = "Years")
@@ -206,7 +206,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             private GetFixedDepositAccountsDepositPeriodFrequency() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.period.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -214,19 +214,19 @@ final class FixedDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "000000001")
         public Long accountNo;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Sangamesh N")
         public String clientName;
         @Schema(example = "3")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "FD01")
         public String savingsProductName;
         @Schema(example = "0")
-        public Integer fieldOfficerId;
+        public Long fieldOfficerId;
         public GetFixedDepositAccountsStatus status;
         public GetFixedDepositAccountsTimeline timeline;
         public GetFixedDepositAccountsCurrency currency;
@@ -262,9 +262,9 @@ final class FixedDepositAccountsApiResourceSwagger {
         private PostFixedDepositAccountsRequest() {}
 
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer productId;
+        public Long productId;
         @Schema(example = "en")
         public String locale;
         @Schema(example = "dd MMMM yyyy")
@@ -276,7 +276,7 @@ final class FixedDepositAccountsApiResourceSwagger {
         @Schema(example = "6")
         public Integer depositPeriod;
         @Schema(example = "2")
-        public Integer depositPeriodFrequencyId;
+        public Long depositPeriodFrequencyId;
     }
 
     @Schema(description = "PostFixedDepositAccountsResponse")
@@ -285,13 +285,13 @@ final class FixedDepositAccountsApiResourceSwagger {
         private PostFixedDepositAccountsResponse() {}
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetFixedDepositAccountsAccountIdResponse")
@@ -312,7 +312,7 @@ final class FixedDepositAccountsApiResourceSwagger {
                     private GetFixedDepositAccountsPeriodType() {}
 
                     @Schema(example = "0")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "interestChartPeriodType.days")
                     public String code;
                     @Schema(example = "Days")
@@ -338,7 +338,7 @@ final class FixedDepositAccountsApiResourceSwagger {
                 }
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 public GetFixedDepositAccountsPeriodType periodType;
                 @Schema(example = "181")
                 public Integer fromPeriod;
@@ -354,7 +354,7 @@ final class FixedDepositAccountsApiResourceSwagger {
                 private GetFixedDepositAccountsPeriodTypes() {}
 
                 @Schema(example = "0")
-                public Integer id;
+                public Long id;
                 @Schema(example = "interestChartPeriodType.days")
                 public String code;
                 @Schema(example = "Days")
@@ -362,11 +362,11 @@ final class FixedDepositAccountsApiResourceSwagger {
             }
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "[2013, 10, 2]")
             public LocalDate fromDate;
             @Schema(example = "5")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "FD000023")
             public Long accountNumber;
             public Set<GetFixedDepositAccountsChartSlabs> chartSlabs;
@@ -403,21 +403,21 @@ final class FixedDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "FD000023")
         public Long accountNo;
         @Schema(example = "FD-23")
         public String externalId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Sangamesh N")
         public String clientName;
         @Schema(example = "3")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "FD01")
         public String savingsProductName;
         @Schema(example = "0")
-        public Integer fieldOfficerId;
+        public Long fieldOfficerId;
         public GetFixedDepositAccountsResponse.GetFixedDepositAccountsStatus status;
         public GetFixedDepositAccountsResponse.GetFixedDepositAccountsTimeline timeline;
         public GetFixedDepositAccountsAccountIdCurrency currency;
@@ -475,13 +475,13 @@ final class FixedDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutFixedDepositAccountsChanges changes;
     }
 
@@ -497,13 +497,13 @@ final class FixedDepositAccountsApiResourceSwagger {
         private PostFixedDepositAccountsAccountIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteFixedDepositAccountsAccountIdResponse")
@@ -512,10 +512,10 @@ final class FixedDepositAccountsApiResourceSwagger {
         private DeleteFixedDepositAccountsAccountIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
index 9fe796d21..96de367d0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
@@ -178,7 +178,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsMinDepositTermType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -190,7 +190,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsMaxDepositTermType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.years")
             public String code;
             @Schema(example = "Years")
@@ -202,7 +202,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsInterestCompoundingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.period.savingsCompoundingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -214,7 +214,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsInterestPostingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.posting.period.savingsPostingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -226,7 +226,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsInterestCalculationType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationType.dailybalance")
             public String code;
             @Schema(example = "Daily Balance")
@@ -238,7 +238,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsInterestCalculationDaysInYearType() {}
 
             @Schema(example = "365")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationDaysInYearType.days365")
             public String code;
             @Schema(example = "365 Days")
@@ -250,7 +250,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsAccountingRule() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountingRuleType.none")
             public String code;
             @Schema(example = "NONE")
@@ -258,7 +258,7 @@ final class FixedDepositProductsApiResourceSwagger {
         }
 
         @Schema(example = "3")
-        public Integer id;
+        public Long id;
         @Schema(example = "FD01")
         public String name;
         @Schema(example = "FD01")
@@ -311,7 +311,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsProductIdInterestCompoundingPeriodType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.period.savingsCompoundingInterestPeriodType.daily")
             public String code;
             @Schema(example = "Daily")
@@ -327,11 +327,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdSavingsReferenceAccount() {}
 
                 @Schema(example = "12")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savings ref")
                 public String name;
                 @Schema(example = "20")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetFixedDepositProductsProductIdIncomeFromFeeAccount {
@@ -339,11 +339,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdIncomeFromFeeAccount() {}
 
                 @Schema(example = "16")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetFixedDepositProductsProductIdIncomeFromPenaltyAccount {
@@ -351,11 +351,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdIncomeFromPenaltyAccount() {}
 
                 @Schema(example = "17")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from sav penalties")
                 public String name;
                 @Schema(example = "25")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetFixedDepositProductsProductIdInterestOnSavingsAccount {
@@ -363,11 +363,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdInterestOnSavingsAccount() {}
 
                 @Schema(example = "15")
-                public Integer id;
+                public Long id;
                 @Schema(example = "interest on savings")
                 public String name;
                 @Schema(example = "23")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetFixedDepositProductsProductIdSavingsControlAccount {
@@ -375,11 +375,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdSavingsControlAccount() {}
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savings ref tool kit")
                 public String name;
                 @Schema(example = "21")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetFixedDepositProductsProductIdTransfersInSuspenseAccount {
@@ -387,11 +387,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdTransfersInSuspenseAccount() {}
 
                 @Schema(example = "14")
-                public Integer id;
+                public Long id;
                 @Schema(example = "saving transfers")
                 public String name;
                 @Schema(example = "22")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetFixedDepositProductsProductIdSavingsReferenceAccount savingsReferenceAccount;
@@ -411,7 +411,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsCharge() {}
 
                 @Schema(example = "11")
-                public Integer id;
+                public Long id;
                 @Schema(example = "sav charge")
                 public String name;
                 @Schema(example = "false")
@@ -425,11 +425,11 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount() {}
 
                 @Schema(example = "16")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsCharge charge;
@@ -445,7 +445,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 private GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge() {}
 
                 @Schema(example = "12")
-                public Integer id;
+                public Long id;
                 @Schema(example = "sav 2")
                 public String name;
                 @Schema(example = "false")
@@ -463,7 +463,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsProductIdPreClosurePenalInterestOnType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "preClosurePenalInterestOnType.wholeTerm")
             public String code;
             @Schema(example = "Whole term")
@@ -475,7 +475,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsProductIdMinDepositTermType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.weeks")
             public String code;
             @Schema(example = "Weeks")
@@ -487,7 +487,7 @@ final class FixedDepositProductsApiResourceSwagger {
             private GetFixedDepositProductsProductIdMaxDepositTermType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.years")
             public String code;
             @Schema(example = "Years")
@@ -507,7 +507,7 @@ final class FixedDepositProductsApiResourceSwagger {
                     private GetFixedDepositProductsProductIdPeriodType() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "interestChartPeriodType.weeks")
                     public String code;
                     @Schema(example = "Weeks")
@@ -515,7 +515,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 }
 
                 @Schema(example = "18")
-                public Integer id;
+                public Long id;
                 @Schema(example = "from 0 to 90 days")
                 public String description;
                 public GetFixedDepositProductsProductIdPeriodType periodType;
@@ -529,11 +529,11 @@ final class FixedDepositProductsApiResourceSwagger {
             }
 
             @Schema(example = "8")
-            public Integer id;
+            public Long id;
             @Schema(example = "[2014, 1, 1]")
             public LocalDate fromDate;
             @Schema(example = "8")
-            public Integer savingsProductId;
+            public Long savingsProductId;
             @Schema(example = "Fixed deposit product")
             public String savingsProductName;
             public Set<GetFixedDepositProductsProductIdChartSlabs> chartSlabs;
@@ -541,7 +541,7 @@ final class FixedDepositProductsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Fixed deposit product")
         public String name;
         @Schema(example = "FD01")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
index 918986970..83f52ae20 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
@@ -40,7 +40,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
             private GetRecurringTransactionType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsAccountTransactionType.deposit")
             public String code;
             @Schema(example = "Deposit")
@@ -90,10 +90,10 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         public GetRecurringTransactionType transactionType;
         @Schema(example = "1")
-        public Integer accountId;
+        public Long accountId;
         @Schema(example = "000000001")
         public String accountNo;
         @Schema(example = "[2014, 6, 25]")
@@ -137,7 +137,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
             private GetRecurringTransactionsTransactionType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsAccountTransactionType.withdrawal")
             public String code;
             @Schema(example = "Withdrawal")
@@ -161,13 +161,13 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
                 private GetRecurringPaymentType() {}
 
                 @Schema(example = "11")
-                public Integer id;
+                public Long id;
                 @Schema(example = "cash")
                 public String name;
             }
 
             @Schema(example = "62")
-            public Integer id;
+            public Long id;
             public GetRecurringPaymentType paymentType;
             @Schema(example = "")
             public Integer accountNumber;
@@ -182,10 +182,10 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         public GetRecurringTransactionsTransactionType transactionType;
         @Schema(example = "1")
-        public Integer accountId;
+        public Long accountId;
         @Schema(example = "000000001")
         public String accountNo;
         @Schema(example = "[2013, 8, 7]")
@@ -249,13 +249,13 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "2")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "47")
-        public Integer resourceId;
+        public Long resourceId;
         public PostRecurringChanges changes;
     }
 
@@ -265,13 +265,13 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
         private PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "2")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "48")
-        public Integer resourceId;
+        public Long resourceId;
         public PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse.PostRecurringChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
index 35e9e85db..e435b6d6d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
@@ -39,13 +39,13 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringProductOptions() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "Passbook Savings")
             public String name;
         }
 
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "small business")
         public String clientName;
         public Set<GetRecurringProductOptions> productOptions;
@@ -61,7 +61,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsStatus() {}
 
             @Schema(example = "100")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsAccountStatusType.submitted.and.pending.approval")
             public String code;
             @Schema(example = "Submitted and pending approval")
@@ -125,7 +125,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsInterestCompoundingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.period.savingsCompoundingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -137,7 +137,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsInterestPostingPeriodType() {}
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "savings.interest.posting.period.savingsPostingInterestPeriodType.monthly")
             public String code;
             @Schema(example = "Monthly")
@@ -149,7 +149,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsInterestCalculationType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationType.dailybalance")
             public String code;
             @Schema(example = "Daily Balance")
@@ -161,7 +161,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsInterestCalculationDaysInYearType() {}
 
             @Schema(example = "365")
-            public Integer id;
+            public Long id;
             @Schema(example = "savingsInterestCalculationDaysInYearType.days365")
             public String code;
             @Schema(example = "365 Days")
@@ -182,7 +182,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsMinDepositTermType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -194,7 +194,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsMaxDepositTermType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.years")
             public String code;
             @Schema(example = "Years")
@@ -206,7 +206,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsDepositPeriodFrequency() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.period.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -218,7 +218,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             private GetRecurringDepositAccountsRecurringDepositFrequencyType() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "recurring.deposit.savingsPeriodFrequencyType.months")
             public String code;
             @Schema(example = "Months")
@@ -226,19 +226,19 @@ final class RecurringDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "000000001")
         public Long accountNo;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Sangamesh N")
         public String clientName;
         @Schema(example = "3")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "RD01")
         public String savingsProductName;
         @Schema(example = "0")
-        public Integer fieldOfficerId;
+        public Long fieldOfficerId;
         public GetRecurringDepositAccountsStatus status;
         public GetRecurringDepositAccountsTimeline timeline;
         public GetRecurringDepositAccountsCurrency currency;
@@ -277,9 +277,9 @@ final class RecurringDepositAccountsApiResourceSwagger {
         private PostRecurringDepositAccountsRequest() {}
 
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer productId;
+        public Long productId;
         @Schema(example = "en")
         public String locale;
         @Schema(example = "dd MMMM yyyy")
@@ -308,13 +308,13 @@ final class RecurringDepositAccountsApiResourceSwagger {
         private PostRecurringDepositAccountsResponse() {}
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "GetRecurringDepositAccountsAccountIdResponse")
@@ -335,7 +335,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
                     private GetRecurringDepositAccountsPeriodType() {}
 
                     @Schema(example = "0")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "interestChartPeriodType.days")
                     public String code;
                     @Schema(example = "Days")
@@ -361,7 +361,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
                 }
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 public GetRecurringDepositAccountsPeriodType periodType;
                 @Schema(example = "181")
                 public Integer fromPeriod;
@@ -377,7 +377,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
                 private GetRecurringDepositAccountsPeriodTypes() {}
 
                 @Schema(example = "0")
-                public Integer id;
+                public Long id;
                 @Schema(example = "interestChartPeriodType.days")
                 public String code;
                 @Schema(example = "Days")
@@ -385,11 +385,11 @@ final class RecurringDepositAccountsApiResourceSwagger {
             }
 
             @Schema(example = "4")
-            public Integer id;
+            public Long id;
             @Schema(example = "[2013, 10, 2]")
             public LocalDate fromDate;
             @Schema(example = "5")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "RD000023")
             public Long accountNumber;
             public Set<GetRecurringDepositAccountsChartSlabs> chartSlabs;
@@ -397,21 +397,21 @@ final class RecurringDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "RD000023")
         public Long accountNo;
         @Schema(example = "RD-23")
         public String externalId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "Sangamesh N")
         public String clientName;
         @Schema(example = "3")
-        public Integer savingsProductId;
+        public Long savingsProductId;
         @Schema(example = "RD01")
         public String savingsProductName;
         @Schema(example = "0")
-        public Integer fieldOfficerId;
+        public Long fieldOfficerId;
         public GetRecurringDepositAccountsResponse.GetRecurringDepositAccountsStatus status;
         public GetRecurringDepositAccountsResponse.GetRecurringDepositAccountsTimeline timeline;
         public GetRecurringDepositAccountsResponse.GetRecurringDepositAccountsCurrency currency;
@@ -468,13 +468,13 @@ final class RecurringDepositAccountsApiResourceSwagger {
         }
 
         @Schema(example = "2")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
         public PutRecurringDepositAccountsChanges changes;
     }
 
@@ -490,13 +490,13 @@ final class RecurringDepositAccountsApiResourceSwagger {
         private PostRecurringDepositAccountsAccountIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteRecurringDepositAccountsResponse")
@@ -505,10 +505,10 @@ final class RecurringDepositAccountsApiResourceSwagger {
         private DeleteRecurringDepositAccountsResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
index 8a1a59326..e07b32c5d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
@@ -280,7 +280,7 @@ final class RecurringDepositProductsApiResourceSwagger {
         }
 
         @Schema(example = "3")
-        public Integer id;
+        public Long id;
         @Schema(example = "RD01")
         public String name;
         @Schema(example = "RD01")
@@ -352,11 +352,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdSavingsReferenceAccount() {}
 
                 @Schema(example = "12")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savings ref")
                 public String name;
                 @Schema(example = "20")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetRecurringDepositProductsProductIdIncomeFromFeeAccount {
@@ -364,11 +364,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdIncomeFromFeeAccount() {}
 
                 @Schema(example = "16")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount {
@@ -376,11 +376,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount() {}
 
                 @Schema(example = "17")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from sav penalties")
                 public String name;
                 @Schema(example = "25")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetRecurringDepositProductsProductIdInterestOnSavingsAccount {
@@ -388,11 +388,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdInterestOnSavingsAccount() {}
 
                 @Schema(example = "15")
-                public Integer id;
+                public Long id;
                 @Schema(example = "interest on savings")
                 public String name;
                 @Schema(example = "23")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetRecurringDepositProductsProductIdSavingsControlAccount {
@@ -400,11 +400,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdSavingsControlAccount() {}
 
                 @Schema(example = "13")
-                public Integer id;
+                public Long id;
                 @Schema(example = "savings ref tool kit")
                 public String name;
                 @Schema(example = "21")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetRecurringDepositProductsProductIdTransfersInSuspenseAccount {
@@ -412,11 +412,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdTransfersInSuspenseAccount() {}
 
                 @Schema(example = "14")
-                public Integer id;
+                public Long id;
                 @Schema(example = "saving transfers")
                 public String name;
                 @Schema(example = "22")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetRecurringDepositProductsProductIdSavingsReferenceAccount savingsReferenceAccount;
@@ -436,7 +436,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsCharge() {}
 
                 @Schema(example = "11")
-                public Integer id;
+                public Long id;
                 @Schema(example = "sav charge")
                 public String name;
                 @Schema(example = "false")
@@ -450,11 +450,11 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount() {}
 
                 @Schema(example = "16")
-                public Integer id;
+                public Long id;
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsCharge charge;
@@ -470,7 +470,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 private GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge() {}
 
                 @Schema(example = "12")
-                public Integer id;
+                public Long id;
                 @Schema(example = "sav 2")
                 public String name;
                 @Schema(example = "false")
@@ -488,7 +488,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             private GetRecurringDepositProductsProductIdPreClosurePenalInterestOnType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "preClosurePenalInterestOnType.wholeTerm")
             public String code;
             @Schema(example = "Whole term")
@@ -500,7 +500,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             private GetRecurringDepositProductsProductIdMinDepositTermType() {}
 
             @Schema(example = "1")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.weeks")
             public String code;
             @Schema(example = "Weeks")
@@ -512,7 +512,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             private GetRecurringDepositProductsProductIdMaxDepositTermType() {}
 
             @Schema(example = "3")
-            public Integer id;
+            public Long id;
             @Schema(example = "deposit.term.savingsPeriodFrequencyType.years")
             public String code;
             @Schema(example = "Years")
@@ -532,7 +532,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                     private GetRecurringDepositProductsProductIdPeriodType() {}
 
                     @Schema(example = "1")
-                    public Integer id;
+                    public Long id;
                     @Schema(example = "interestChartPeriodType.weeks")
                     public String code;
                     @Schema(example = "Weeks")
@@ -540,7 +540,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 }
 
                 @Schema(example = "18")
-                public Integer id;
+                public Long id;
                 @Schema(example = "from 0 to 90 days")
                 public String description;
                 public GetRecurringDepositProductsProductIdPeriodType periodType;
@@ -554,11 +554,11 @@ final class RecurringDepositProductsApiResourceSwagger {
             }
 
             @Schema(example = "8")
-            public Integer id;
+            public Long id;
             @Schema(example = "[2014, 1, 1]")
             public LocalDate fromDate;
             @Schema(example = "8")
-            public Integer savingsProductId;
+            public Long savingsProductId;
             @Schema(example = "Recurring deposit product")
             public String savingsProductName;
             public Set<GetRecurringDepositProductsProductIdChartSlabs> chartSlabs;
@@ -566,7 +566,7 @@ final class RecurringDepositProductsApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "Recurring deposit product")
         public String name;
         @Schema(example = "RD01")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
index f8f817c2c..d1f45a01b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
@@ -74,11 +74,11 @@ final class SavingsAccountChargesApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "3")
-        public Integer chargeId;
+        public Long chargeId;
         @Schema(example = "57")
-        public Integer accountId;
+        public Long accountId;
         @Schema(example = "Savings account maintenance fee")
         public String name;
         public GetChargesChargeTimeType chargeTimeType;
@@ -138,7 +138,7 @@ final class SavingsAccountChargesApiResourceSwagger {
             }
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "Passbook Fee")
             public String name;
             @Schema(example = "true")
@@ -170,9 +170,9 @@ final class SavingsAccountChargesApiResourceSwagger {
         private GetSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "1")
-        public Integer chargeId;
+        public Long chargeId;
         @Schema(example = "Passbook fee")
         public String name;
         public GetSavingsAccountsSavingsAccountIdChargesResponse.GetChargesChargeTimeType chargeTimeType;
@@ -204,7 +204,7 @@ final class SavingsAccountChargesApiResourceSwagger {
         private PostSavingsAccountsSavingsAccountIdChargesRequest() {}
 
         @Schema(example = "2")
-        public Integer chargeId;
+        public Long chargeId;
         @Schema(example = "en")
         public String locale;
         @Schema(example = "100")
@@ -221,13 +221,13 @@ final class SavingsAccountChargesApiResourceSwagger {
         private PostSavingsAccountsSavingsAccountIdChargesResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "6")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest")
@@ -265,13 +265,13 @@ final class SavingsAccountChargesApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "6")
-        public Integer resourceId;
+        public Long resourceId;
         public PutSavingsChanges changes;
     }
 
@@ -296,13 +296,13 @@ final class SavingsAccountChargesApiResourceSwagger {
         private PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse")
@@ -311,12 +311,12 @@ final class SavingsAccountChargesApiResourceSwagger {
         private DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "2")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResourceSwagger.java
index 3e7f53239..3b06298da 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountTransactionsApiResourceSwagger.java
@@ -216,13 +216,13 @@ final class SavingsAccountTransactionsApiResourceSwagger {
         private PostSavingsAccountTransactionsResponse() {}
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "1")
-        public Integer clientId;
+        public Long clientId;
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 
     @Schema(description = "PostSavingsAccountBulkReversalTransactionsRequest")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
index 5aaeabbc0..b44afc2e7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
@@ -239,7 +239,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "savings ref")
                 public String name;
                 @Schema(example = "20")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetSavingsProductsIncomeFromFeeAccount {
@@ -251,7 +251,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetSavingsProductsIncomeFromPenaltyAccount {
@@ -263,7 +263,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "income from sav penalties")
                 public String name;
                 @Schema(example = "25")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetSavingsProductsInterestOnSavingsAccount {
@@ -275,7 +275,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "interest on savings")
                 public String name;
                 @Schema(example = "23")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetSavingsProductsSavingsControlAccount {
@@ -287,7 +287,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "savings ref tool kit")
                 public String name;
                 @Schema(example = "21")
-                public Integer glCode;
+                public String glCode;
             }
 
             static final class GetSavingsProductsTransfersInSuspenseAccount {
@@ -299,7 +299,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "saving transfers")
                 public String name;
                 @Schema(example = "22")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetSavingsProductsSavingsReferenceAccount savingsReferenceAccount;
@@ -333,7 +333,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "savings ref")
                 public String name;
                 @Schema(example = "20")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetSavingsProductsPaymentType paymentType;
@@ -367,7 +367,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "income from savings fee")
                 public String name;
                 @Schema(example = "24")
-                public Integer glCode;
+                public String glCode;
             }
 
             public GetSavingsProductsFeeToIncomeAccountMappingsCharge charge;
@@ -524,7 +524,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "Savings Control")
                 public String name;
                 @Schema(example = "50001")
-                public Integer glCode;
+                public String glCode;
                 @Schema(example = "false")
                 public Boolean disabled;
                 @Schema(example = "true")
@@ -562,7 +562,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "Cash")
                 public String name;
                 @Schema(example = "100001")
-                public Integer glCode;
+                public String glCode;
                 @Schema(example = "false")
                 public Boolean disabled;
                 @Schema(example = "true")
@@ -593,7 +593,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "Write Off Expenses")
                 public String name;
                 @Schema(example = "60001")
-                public Integer glCode;
+                public String glCode;
                 @Schema(example = "false")
                 public Boolean disabled;
                 @Schema(example = "true")
@@ -624,7 +624,7 @@ final class SavingsProductsApiResourceSwagger {
                 @Schema(example = "income from interest")
                 public String name;
                 @Schema(example = "40001")
-                public Integer glCode;
+                public String glCode;
                 @Schema(example = "false")
                 public Boolean disabled;
                 @Schema(example = "true")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
index cdda461cf..733745642 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
@@ -39,7 +39,7 @@ final class SelfAccountTransferApiResourceSwagger {
             private GetAccountOptions() {}
 
             @Schema(example = "2")
-            public Integer id;
+            public Long id;
             @Schema(example = "accountType.savings")
             public String code;
             @Schema(example = "Savings Account")
@@ -53,16 +53,16 @@ final class SelfAccountTransferApiResourceSwagger {
             private GetFromAccountOptions() {}
 
             @Schema(example = "2")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "00000001")
             public Integer accountNo;
             public GetAccountTransferTemplateResponse.GetAccountOptions accountType;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "ABC")
             public String clientName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "HEAD OFFICE")
             public String officeName;
 
@@ -75,16 +75,16 @@ final class SelfAccountTransferApiResourceSwagger {
             private GetToAccountOptions() {}
 
             @Schema(example = "2")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "00000001")
             public Integer accountNo;
             public GetAccountTransferTemplateResponse.GetAccountOptions accountType;
             @Schema(example = "1")
-            public Integer clientId;
+            public Long clientId;
             @Schema(example = "ABC")
             public String clientName;
             @Schema(example = "1")
-            public Integer officeId;
+            public Long officeId;
             @Schema(example = "HEAD OFFICE")
             public String officeName;
 
@@ -133,8 +133,8 @@ final class SelfAccountTransferApiResourceSwagger {
         private PostNewTransferResponse() {}
 
         @Schema(example = "1")
-        public Integer savingsId;
+        public Long savingsId;
         @Schema(example = "1")
-        public Integer resourceId;
+        public Long resourceId;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
index 4c6ca8b1a..c3639feba 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
@@ -39,7 +39,7 @@ final class PocketApiResourceSwagger {
             private GetPocketAccountDetail() {}
 
             @Schema(example = "11")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "LOAN")
             public String accountType;
         }
@@ -66,15 +66,15 @@ final class PocketApiResourceSwagger {
             private GetPocketLoanAccounts() {}
 
             @Schema(example = "6")
-            public Integer pocketId;
+            public Long pocketId;
             @Schema(example = "11")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "2")
             public Integer accountType;
             @Schema(example = "000000011")
             public Integer accountNumber;
             @Schema(example = "10")
-            public Integer id;
+            public Long id;
         }
 
         static final class GetPocketSavingAccounts {
@@ -82,15 +82,15 @@ final class PocketApiResourceSwagger {
             private GetPocketSavingAccounts() {}
 
             @Schema(example = "6")
-            public Integer pocketId;
+            public Long pocketId;
             @Schema(example = "2")
-            public Integer accountId;
+            public Long accountId;
             @Schema(example = "3")
             public Integer accountType;
             @Schema(example = "000000002")
             public Integer accountNumber;
             @Schema(example = "11")
-            public Integer id;
+            public Long id;
         }
 
         static final class GetPocketShareAccounts {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
index 3f3292b86..1c123de56 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
@@ -52,9 +52,9 @@ final class SelfUserApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "6")
-        public Integer resourceId;
+        public Long resourceId;
         public PutSelfUserChanges changes;
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
index 2ccf0ebbb..ef7b0fe2f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
@@ -61,17 +61,17 @@ final class SelfUserDetailsApiResourceSwagger {
         @Schema(example = "mifos")
         public String username;
         @Schema(example = "1")
-        public Integer userId;
+        public Long userId;
         @Schema(example = "bWlmb3M6cGFzc3dvcmQ=")
         public String base64EncodedAuthenticationKey;
         @Schema(example = "true")
         public Boolean authenticated;
         @Schema(example = "1")
-        public Integer officeId;
+        public Long officeId;
         @Schema(example = "Head Office")
         public String officeName;
         @Schema(example = "1")
-        public Integer staffId;
+        public Long staffId;
         @Schema(example = "Director, Program")
         public String staffDisplayName;
         public GetSelfUserDetailsOrganisationalRole organisationalRole;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
index 9f9386e84..280b39624 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
@@ -207,7 +207,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "Cash in Hand")
                     public String name;
                     @Schema(example = "20301")
-                    public Integer glCode;
+                    public String glCode;
 
                 }
 
@@ -220,7 +220,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "Other Operating Income")
                     public String name;
                     @Schema(example = "30105")
-                    public Integer glCode;
+                    public String glCode;
 
                 }
 
@@ -233,7 +233,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "Share Equity")
                     public String name;
                     @Schema(example = "00098")
-                    public Integer glCode;
+                    public String glCode;
 
                 }
 
@@ -246,7 +246,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "Overpayment Liability")
                     public String name;
                     @Schema(example = "10200")
-                    public Integer glCode;
+                    public String glCode;
 
                 }
 
@@ -336,7 +336,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "1")
                     public Integer parentId;
                     @Schema(example = "10104")
-                    public Integer glCode;
+                    public String glCode;
                     @Schema(example = "false")
                     public Boolean disabled;
                     @Schema(example = "true")
@@ -399,7 +399,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "8")
                     public Integer parentId;
                     @Schema(example = "20101")
-                    public Integer glCode;
+                    public String glCode;
                     @Schema(example = "false")
                     public Boolean disabled;
                     @Schema(example = "true")
@@ -460,7 +460,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "Loan Recovery (Temp)")
                     public String name;
                     @Schema(example = "220002-Temp")
-                    public Integer glCode;
+                    public String glCode;
                     @Schema(example = "false")
                     public Boolean disabled;
                     @Schema(example = "true")
@@ -524,7 +524,7 @@ final class SelfShareAccountsApiResourceSwagger {
                     @Schema(example = "25")
                     public Integer parentId;
                     @Schema(example = "00098")
-                    public Integer glCode;
+                    public String glCode;
                     @Schema(example = "false")
                     public Boolean disabled;
                     @Schema(example = "true")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
index 3eadbb6fd..1ac4cf76a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
@@ -64,7 +64,7 @@ final class TaxComponentApiResourceSwagger {
         }
 
         @Schema(example = "1")
-        public Integer id;
+        public Long id;
         @Schema(example = "tax component 1")
         public String name;
         @Schema(example = "10.000000")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
index 1a3c4a0f9..d08764a1e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
@@ -44,20 +44,20 @@ final class TaxGroupApiResourceSwagger {
                 private GetTaxesGroupTaxComponent() {}
 
                 @Schema(example = "7")
-                public Integer id;
+                public Long id;
                 @Schema(example = "tax component 2")
                 public String name;
             }
 
             @Schema(example = "7")
-            public Integer id;
+            public Long id;
             public GetTaxesGroupTaxComponent taxComponent;
             @Schema(example = "[2016, 4, 11]")
             public LocalDate startDate;
         }
 
         @Schema(example = "7")
-        public Integer id;
+        public Long id;
         @Schema(example = "tax group 1")
         public String name;
         public Set<GetTaxesGroupTaxAssociations> taxAssociations;
@@ -73,7 +73,7 @@ final class TaxGroupApiResourceSwagger {
             private PostTaxesGroupTaxComponents() {}
 
             @Schema(example = "7")
-            public Integer taxComponentId;
+            public Long taxComponentId;
             @Schema(example = "11 April 2016")
             public String startDate;
         }
@@ -106,9 +106,9 @@ final class TaxGroupApiResourceSwagger {
             private PutTaxesGroupTaxComponents() {}
 
             @Schema(example = "7")
-            public Integer id;
+            public Long id;
             @Schema(example = "7")
-            public Integer taxComponentId;
+            public Long taxComponentId;
             @Schema(example = "22 April 2016")
             public String endDate;
         }
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
index 4e9ab1562..5fae515d8 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/BaseLoanIntegrationTest.java
@@ -121,7 +121,7 @@ public abstract class BaseLoanIntegrationTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .amortizationType(1)//
                 .interestType(0)//
                 .isEqualAmortization(false)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
index d9833a12c..4ca9fedfa 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
@@ -6894,7 +6894,7 @@ public class ClientLoanIntegrationTest {
     }
 
     private PostClientsRequest createRandomClientWithDate(String date) {
-        return new PostClientsRequest().officeId(1).legalFormId(1).firstname(Utils.randomStringGenerator("", 5))
+        return new PostClientsRequest().officeId(1L).legalFormId(1L).firstname(Utils.randomStringGenerator("", 5))
                 .lastname(Utils.randomStringGenerator("", 5)).active(true).locale("en").activationDate(date).dateFormat(DATETIME_PATTERN);
     }
 
@@ -8036,7 +8036,7 @@ public class ClientLoanIntegrationTest {
         return SavingsProductHelper.createSavingsProduct(savingsProductJSON, REQUEST_SPEC, RESPONSE_SPEC);
     }
 
-    private PostLoansResponse applyForLoanApplicationForOnePeriod30DaysLongNoInterestPeriodicAccrual(Integer clientId, Long loanProductId,
+    private PostLoansResponse applyForLoanApplicationForOnePeriod30DaysLongNoInterestPeriodicAccrual(Long clientId, Long loanProductId,
             String loanDisbursementDate, String repaymentStrategyCode) {
         return LOAN_TRANSACTION_HELPER.applyLoan(new PostLoansRequest().clientId(clientId.longValue()).productId(loanProductId)
                 .expectedDisbursementDate(loanDisbursementDate).dateFormat(DATETIME_PATTERN)
@@ -8068,7 +8068,7 @@ public class ClientLoanIntegrationTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .amortizationType(1)//
                 .interestType(0)//
                 .isEqualAmortization(false)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientStatusChecker.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
index a1945e054..0432414be 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
@@ -39,7 +39,7 @@ public final class ClientStatusChecker {
     }
 
     public static void verifyClientStatus(final ClientStatus status, final GetClientsClientIdResponse clientResponse) {
-        assertEquals(status.getValue(), clientResponse.getStatus().getId());
+        assertEquals(status.getValue().longValue(), clientResponse.getStatus().getId());
     }
 
     public static void verifyClientClosed(final HashMap<String, Object> clientStatusHashMap) {
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientTest.java
index 96ad52d64..1012537ae 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientTest.java
@@ -222,8 +222,9 @@ public class ClientTest {
         long postalCode = 1000L;
 
         // when
-        PostClientsAddressRequest addressRequest = new PostClientsAddressRequest().postalCode(postalCode).city(city).countryId(countryId)
-                .stateProvinceId(stateId).addressTypeId(addressTypeId.longValue()).isActive(addressIsActive);
+        PostClientsAddressRequest addressRequest = new PostClientsAddressRequest().postalCode(postalCode).city(city)
+                .countryId(Long.valueOf(countryId)).stateProvinceId(Long.valueOf(stateId)).addressTypeId(addressTypeId.longValue())
+                .isActive(addressIsActive);
         PostClientsRequest request = ClientHelper.defaultClientCreationRequest().address(List.of(addressRequest));
         final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, request);
 
@@ -254,7 +255,7 @@ public class ClientTest {
         final Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, clientRequest);
         // when
         PostClientClientIdAddressesRequest request = new PostClientClientIdAddressesRequest().postalCode(postalCode).city(city)
-                .countryId(countryId).stateProvinceId(stateId).isActive(addressIsActive);
+                .countryId(Long.valueOf(countryId)).stateProvinceId(Long.valueOf(stateId)).isActive(addressIsActive);
         PostClientClientIdAddressesResponse response = ClientHelper.createClientAddress(requestSpec, responseSpec, clientId.longValue(),
                 addressTypeId, request);
         // then
@@ -276,7 +277,7 @@ public class ClientTest {
         String lastName = Utils.randomStringGenerator("LN", 48);
         String fullName = firstName + ' ' + middleName + ' ' + lastName;
 
-        PostClientsRequest request = new PostClientsRequest().officeId(1).legalFormId(LEGALFORM_ID_PERSON).firstname(firstName)
+        PostClientsRequest request = new PostClientsRequest().officeId(1L).legalFormId(LEGALFORM_ID_PERSON).firstname(firstName)
                 .middlename(middleName).lastname(lastName).externalId(UUID.randomUUID().toString()).dateFormat(Utils.DATE_FORMAT)
                 .locale("en").active(true).activationDate(DEFAULT_DATE);
         Integer clientId = ClientHelper.createClient(requestSpec, responseSpec, request);
@@ -286,7 +287,7 @@ public class ClientTest {
         assertNotNull(client);
         assertEquals(fullName, client.getDisplayName());
 
-        request = new PostClientsRequest().officeId(1).legalFormId(LEGALFORM_ID_PERSON).fullname(fullName)
+        request = new PostClientsRequest().officeId(1L).legalFormId(LEGALFORM_ID_PERSON).fullname(fullName)
                 .externalId(UUID.randomUUID().toString()).dateFormat(Utils.DATE_FORMAT).locale("en").active(true)
                 .activationDate(DEFAULT_DATE);
         clientId = ClientHelper.createClient(requestSpec, responseSpec, request);
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java
index 057996650..0b6dfd6ba 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyAndChargebackIntegrationTest.java
@@ -108,7 +108,7 @@ public class DelinquencyAndChargebackIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), loanProductTestBuilder);
+                    Math.toIntExact(delinquencyBucket.getId()), loanProductTestBuilder);
             assertNotNull(getLoanProductsProductResponse);
 
             // Older date to have more than one overdue installment
@@ -228,7 +228,7 @@ public class DelinquencyAndChargebackIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), loanProductTestBuilder);
+                    Math.toIntExact(delinquencyBucket.getId()), loanProductTestBuilder);
             assertNotNull(getLoanProductsProductResponse);
 
             // Older date to have more than one overdue installment
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java
index dcac50af7..928ea3e60 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java
@@ -285,7 +285,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), null);
+                    Math.toIntExact(delinquencyBucket.getId()), null);
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
             assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -381,7 +381,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), null);
+                    Math.toIntExact(delinquencyBucket.getId()), null);
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
             assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -478,7 +478,7 @@ public class DelinquencyBucketsIntegrationTest {
         // Client and Loan account creation
         final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
         final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                delinquencyBucket.getId(), null);
+                Math.toIntExact(delinquencyBucket.getId()), null);
         assertNotNull(getLoanProductsProductResponse);
         log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
         assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -571,7 +571,7 @@ public class DelinquencyBucketsIntegrationTest {
         // Client and Loan account creation
         final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
         final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                delinquencyBucket.getId(), null);
+                Math.toIntExact(delinquencyBucket.getId()), null);
         assertNotNull(getLoanProductsProductResponse);
         log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
         assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -679,7 +679,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), null);
+                    Math.toIntExact(delinquencyBucket.getId()), null);
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
             assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -768,7 +768,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), null);
+                    Math.toIntExact(delinquencyBucket.getId()), null);
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
             assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -870,7 +870,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), "3");
+                    Math.toIntExact(delinquencyBucket.getId()), "3");
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Bucket Name: {}", getLoanProductsProductResponse.getDelinquencyBucket().getName());
             assertEquals(getLoanProductsProductResponse.getDelinquencyBucket().getName(), delinquencyBucket.getName());
@@ -949,7 +949,7 @@ public class DelinquencyBucketsIntegrationTest {
             // Client and Loan account creation
             final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
             final GetLoanProductsProductIdResponse getLoanProductsProductResponse = createLoanProduct(loanTransactionHelper,
-                    delinquencyBucket.getId(), "3");
+                    Math.toIntExact(delinquencyBucket.getId()), "3");
             assertNotNull(getLoanProductsProductResponse);
             log.info("Loan Product Arrears: {}", getLoanProductsProductResponse.getInArrearsTolerance());
             assertEquals(3, getLoanProductsProductResponse.getInArrearsTolerance());
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java
index 3c337f832..d5824bdc6 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java
@@ -413,15 +413,15 @@ public class ExternalIdSupportIntegrationTest extends IntegrationTest {
 
         // Check whether an external id was generated
         final PostLoansLoanIdTransactionsResponse chargeRefundResult = loanTransactionHelper.makeChargeRefund(loanExternalIdStr,
-                new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").locale("en").loanChargeId(penalty1LoanChargeId)
-                        .transactionAmount(1.0));
+                new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").locale("en")
+                        .loanChargeId(Long.valueOf(penalty1LoanChargeId)).transactionAmount(1.0));
         assertNotNull(chargeRefundResult.getResourceExternalId());
 
         // Check whether the provided external id was retrieved
         transactionExternalIdStr = UUID.randomUUID().toString();
         final PostLoansLoanIdTransactionsResponse chargeRefundResultWithExternalId = loanTransactionHelper
                 .makeChargeRefund(loanExternalIdStr, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").locale("en")
-                        .loanChargeId(penalty1LoanChargeId).transactionAmount(1.0).externalId(transactionExternalIdStr));
+                        .loanChargeId(Long.valueOf(penalty1LoanChargeId)).transactionAmount(1.0).externalId(transactionExternalIdStr));
         assertEquals(transactionExternalIdStr, chargeRefundResultWithExternalId.getResourceExternalId());
 
         response = loanTransactionHelper.getLoanTransactionDetails((long) loanId, transactionExternalIdStr);
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
index 2523a58b6..06275fb93 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeOffWithAdvancedPaymentAllocationTest.java
@@ -671,7 +671,7 @@ public class LoanAccountChargeOffWithAdvancedPaymentAllocationTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .principalVariationsForBorrowerCycle(principalVariationsForBorrowerCycle)//
                 .numberOfRepaymentVariationsForBorrowerCycle(numberOfRepaymentVariationsForBorrowerCycle)//
                 .interestRateVariationsForBorrowerCycle(interestRateVariationsForBorrowerCycle)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
index 9ef638155..10e264d0d 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest.java
@@ -423,7 +423,7 @@ public class LoanAccountChargeReveseReplayWithAdvancedPaymentAllocationTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .principalVariationsForBorrowerCycle(principalVariationsForBorrowerCycle)//
                 .numberOfRepaymentVariationsForBorrowerCycle(numberOfRepaymentVariationsForBorrowerCycle)//
                 .interestRateVariationsForBorrowerCycle(interestRateVariationsForBorrowerCycle)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
index 57cbaab09..d7bff32ec 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanPostChargeOffScenariosTest.java
@@ -1176,7 +1176,7 @@ public class LoanPostChargeOffScenariosTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .principalVariationsForBorrowerCycle(principalVariationsForBorrowerCycle)//
                 .numberOfRepaymentVariationsForBorrowerCycle(numberOfRepaymentVariationsForBorrowerCycle)//
                 .interestRateVariationsForBorrowerCycle(interestRateVariationsForBorrowerCycle)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanWithAdvancedPaymentAllocationIntegrationTests.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanWithAdvancedPaymentAllocationIntegrationTests.java
index fc0d6281e..eff7c5073 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanWithAdvancedPaymentAllocationIntegrationTests.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/LoanWithAdvancedPaymentAllocationIntegrationTests.java
@@ -92,7 +92,7 @@ public class LoanWithAdvancedPaymentAllocationIntegrationTests {
         Assertions.assertNotNull(loanProductId);
         GetLoanProductsProductIdResponse loanProduct = LOAN_TRANSACTION_HELPER.getLoanProduct(loanProductId);
         final PostClientsResponse clientResponse = CLIENT_HELPER.createClient(new PostClientsRequest().activationDate("01 January 2022")
-                .active(true).dateFormat("dd MMMM yyyy").fullname("fullName").locale("en").legalFormId(1).officeId(1));
+                .active(true).dateFormat("dd MMMM yyyy").fullname("fullName").locale("en").legalFormId(1L).officeId(1L));
         Integer loanId = createLoanAccount(LOAN_TRANSACTION_HELPER, clientResponse.getClientId().toString(), loanProductId.toString(),
                 "02 January 2022");
         // then
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
index 0502db9a6..59b0b0e7d 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/UndoRepaymentWithDownPaymentIntegrationTest.java
@@ -262,7 +262,7 @@ public class UndoRepaymentWithDownPaymentIntegrationTest {
                 .maxInterestRatePerPeriod((double) 0)//
                 .interestRateFrequencyType(2)//
                 .repaymentEvery(30)//
-                .repaymentFrequencyType(0)//
+                .repaymentFrequencyType(0L)//
                 .principalVariationsForBorrowerCycle(principalVariationsForBorrowerCycle)//
                 .numberOfRepaymentVariationsForBorrowerCycle(numberOfRepaymentVariationsForBorrowerCycle)//
                 .interestRateVariationsForBorrowerCycle(interestRateVariationsForBorrowerCycle)//
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java
index 2aac4c3a7..867f218ce 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientTest.java
@@ -56,7 +56,7 @@ public class ClientTest extends IntegrationTest {
         // TODO why dateFormat and locale required even when no activationDate?!
         // https://issues.apache.org/jira/browse/FINERACT-1233
         return ok(fineract().clients.create6(
-                new PostClientsRequest().legalFormId(1).officeId(1).fullname("TestClient").dateFormat(dateFormat()).locale("en_US")))
+                new PostClientsRequest().legalFormId(1L).officeId(1L).fullname("TestClient").dateFormat(dateFormat()).locale("en_US")))
                 .getClientId();
     }
 
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java
index 642783afb..cfd9d50ee 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/ClientHelper.java
@@ -81,8 +81,8 @@ public class ClientHelper extends IntegrationTest {
     public static final String UNDOREJECT_CLIENT_COMMAND = "undoRejection";
     public static final String UNDOWITHDRAWN_CLIENT_COMMAND = "undoWithdrawal";
     public static final String DEFAULT_OFFICE_ID = "1";
-    public static final Integer LEGALFORM_ID_PERSON = 1;
-    public static final Integer LEGALFORM_ID_ENTITY = 2;
+    public static final Long LEGALFORM_ID_PERSON = 1L;
+    public static final Long LEGALFORM_ID_ENTITY = 2L;
     public static final String CREATED_DATE = Utils.getLocalDateOfTenant().minusDays(5).format(Utils.dateFormatter);
     public static final String CREATED_DATE_PLUS_ONE = Utils.getLocalDateOfTenant().minusDays(4).format(Utils.dateFormatter);
     public static final String CREATED_DATE_PLUS_TWO = Utils.getLocalDateOfTenant().minusDays(3).format(Utils.dateFormatter);
@@ -319,12 +319,11 @@ public class ClientHelper extends IntegrationTest {
         return (Integer) getClient(requestSpec, responseSpec, clientId, "staffId");
     }
 
-    public static HashMap<String, Object> setInitialClientValues(final String officeId, final Integer legalFormId) {
+    public static HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId) {
         return setInitialClientValues(officeId, legalFormId, UUID.randomUUID().toString());
     }
 
-    public static HashMap<String, Object> setInitialClientValues(final String officeId, final Integer legalFormId,
-            final String externalId) {
+    public static HashMap<String, Object> setInitialClientValues(final String officeId, final Long legalFormId, final String externalId) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("officeId", officeId);
         map.put("legalFormId", legalFormId);
@@ -338,7 +337,7 @@ public class ClientHelper extends IntegrationTest {
         return map;
     }
 
-    public static String getBasicClientAsJSON(final String officeId, final Integer legalFormId, final String externalId) {
+    public static String getBasicClientAsJSON(final String officeId, final Long legalFormId, final String externalId) {
         HashMap<String, Object> map = setInitialClientValues(officeId, legalFormId, externalId);
         map.put("active", "true");
         map.put("activationDate", DEFAULT_DATE);
@@ -867,7 +866,7 @@ public class ClientHelper extends IntegrationTest {
     }
 
     public static PostClientsRequest defaultClientCreationRequest() {
-        return new PostClientsRequest().officeId(1).legalFormId(LEGALFORM_ID_PERSON)
+        return new PostClientsRequest().officeId(1L).legalFormId(LEGALFORM_ID_PERSON)
                 .firstname(Utils.randomStringGenerator("Client_FirstName_", 5)).lastname(Utils.randomStringGenerator("Client_LastName_", 5))
                 .externalId(UUID.randomUUID().toString()).dateFormat(Utils.DATE_FORMAT).locale("en").active(true)
                 .activationDate(DEFAULT_DATE);
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java
index 6d1b5d606..888bbd78e 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java
@@ -185,7 +185,7 @@ public class InlineLoanCOBTest {
             final GetDelinquencyBucketsResponse delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
                     delinquencyBucketResponse.getResourceId());
 
-            final Integer loanProductID = createLoanProduct(loanTransactionHelper, delinquencyBucket.getId());
+            final Integer loanProductID = createLoanProduct(loanTransactionHelper, Math.toIntExact(delinquencyBucket.getId()));
 
             Assertions.assertNotNull(loanProductID);
             HashMap loanStatusHashMap;