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 6cbbfeca7..9187671ae 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
@@ -19,6 +19,7 @@
 package org.apache.fineract.portfolio.delinquency.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.LocalDate;
 
 public final class DelinquencyApiResourceSwagger {
 
@@ -133,4 +134,21 @@ public final class DelinquencyApiResourceSwagger {
         public Integer resourceId;
     }
 
+    @Schema(description = "GetDelinquencyTagHistoryResponse")
+    public static final class GetDelinquencyTagHistoryResponse {
+
+        private GetDelinquencyTagHistoryResponse() {}
+
+        @Schema(example = "1")
+        public Integer id;
+        @Schema(example = "10")
+        public Long loanId;
+        @Schema(example = "Delinquent 1")
+        public String delinquencyRange;
+        @Schema(example = "2013,1,2")
+        public LocalDate addedOnDate;
+        @Schema(example = "2013,2,20")
+        public LocalDate liftedOnDate;
+    }
+
 }
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 ccded21c3..a3bc7cd48 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
@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
+import org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyRangesResponse;
 
 /**
  * Created by Chirag Gupta on 12/09/17.
@@ -960,6 +961,7 @@ final class LoansApiResourceSwagger {
         public GetLoansLoanIdCollectionData delinquent;
         @Schema(description = "Set of charges")
         public Set<GetLoansLoanIdLoanChargeData> charges;
+        public GetDelinquencyRangesResponse delinquencyRange;
     }
 
     @Schema(description = "GetLoansResponse")
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 3aa826ef5..89ee4f657 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
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Set;
 import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
+import org.apache.fineract.portfolio.delinquency.api.DelinquencyApiResourceSwagger.GetDelinquencyBucketsResponse;
 
 /**
  * Created by Chirag Gupta on 12/27/17.
@@ -151,6 +152,8 @@ final class LoanProductsApiResourceSwagger {
         public Integer overpaymentLiabilityAccountId;
         @Schema(example = "41")
         public Integer writeOffAccountId;
+        @Schema(example = "48")
+        public Integer goodwillCreditAccountId;
         @Schema(example = "false")
         public Boolean includeInBorrowerCycle;
         @Schema(example = "false")
@@ -1221,6 +1224,7 @@ final class LoanProductsApiResourceSwagger {
         public Integer overdueDaysForNPA;
         @Schema(example = "50")
         public Integer principalThresholdForLastInstalment;
+        public GetDelinquencyBucketsResponse delinquencyBucket;
     }
 
     @Schema(description = "PutLoanProductsProductIdRequest")