diff --git a/fineract-investor/src/main/resources/jpa/static-weaving/module/investor/persistence.xml b/fineract-investor/src/main/resources/jpa/static-weaving/module/investor/persistence.xml
index 4468eb515..656e3f3ea 100644
--- a/fineract-investor/src/main/resources/jpa/static-weaving/module/investor/persistence.xml
+++ b/fineract-investor/src/main/resources/jpa/static-weaving/module/investor/persistence.xml
@@ -88,6 +88,9 @@
         <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMapping</class>
         <class>org.apache.fineract.investor.domain.ExternalAssetOwnerJournalEntryMapping</class>
 
+        <!-- Investor Module Converters -->
+        <class>org.apache.fineract.investor.domain.ExternalIdConverter</class>
+
         <!-- Loan Module Entities -->
         <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
         <class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
@@ -109,7 +112,6 @@
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRescheduleRequestToTermVariationMapping</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusChangeHistory</class>
-        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTopupDetails</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheCharge</class>
@@ -130,13 +132,19 @@
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
         <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
         <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
 
+        <!-- Loan Module Converters -->
+        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
         <!-- Tax Module Entities -->
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
diff --git a/fineract-loan/src/main/resources/jpa/static-weaving/module/loan/persistence.xml b/fineract-loan/src/main/resources/jpa/static-weaving/module/loan/persistence.xml
index cf99a6070..0a8b7e2fe 100644
--- a/fineract-loan/src/main/resources/jpa/static-weaving/module/loan/persistence.xml
+++ b/fineract-loan/src/main/resources/jpa/static-weaving/module/loan/persistence.xml
@@ -100,7 +100,6 @@
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRescheduleRequestToTermVariationMapping</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusChangeHistory</class>
-        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTopupDetails</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheCharge</class>
@@ -121,13 +120,19 @@
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
         <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
         <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
 
+        <!-- Loan Module Converters -->
+        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
         <!-- Tax Module Entities -->
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
diff --git a/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml b/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml
index 53b878af9..9020127fa 100644
--- a/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml
+++ b/fineract-progressive-loan/src/main/resources/jpa/static-weaving/module/progressive-loan/persistence.xml
@@ -100,7 +100,6 @@
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRescheduleRequestToTermVariationMapping</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusChangeHistory</class>
-        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTopupDetails</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheCharge</class>
@@ -121,13 +120,19 @@
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
         <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
         <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
 
+        <!-- Loan Module Converters -->
+        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
         <!-- Tax Module Entities -->
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponent</class>
         <class>org.apache.fineract.portfolio.tax.domain.TaxComponentHistory</class>
diff --git a/fineract-provider/src/main/resources/jpa/static-weaving/module/provider/persistence.xml b/fineract-provider/src/main/resources/jpa/static-weaving/module/provider/persistence.xml
index fb51c9430..7c7b5dd9c 100644
--- a/fineract-provider/src/main/resources/jpa/static-weaving/module/provider/persistence.xml
+++ b/fineract-provider/src/main/resources/jpa/static-weaving/module/provider/persistence.xml
@@ -175,6 +175,9 @@
         <class>org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMapping</class>
         <class>org.apache.fineract.investor.domain.ExternalAssetOwnerJournalEntryMapping</class>
 
+        <!-- Investor Module Converters -->
+        <class>org.apache.fineract.investor.domain.ExternalIdConverter</class>
+
         <!-- Loan Module Entities -->
         <class>org.apache.fineract.portfolio.delinquency.domain.DelinquencyBucketMappings</class>
         <class>org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction</class>
@@ -196,7 +199,6 @@
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanRescheduleRequestToTermVariationMapping</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusChangeHistory</class>
-        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTopupDetails</class>
         <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTrancheCharge</class>
@@ -217,13 +219,19 @@
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductPaymentAllocationRule</class>
         <class>org.apache.fineract.portfolio.loanproduct.domain.LoanProductVariableInstallmentConfig</class>
         <class>org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
-        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.ClientCollateralManagement</class>
         <class>org.apache.fineract.portfolio.collateralmanagement.domain.CollateralManagementDomain</class>
         <class>org.apache.fineract.portfolio.collateral.domain.LoanCollateral</class>
 
+        <!-- Loan Module Converters -->
+        <class>org.apache.fineract.portfolio.loanproduct.domain.AllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.AccountingRuleTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanSubStatusConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionTypeConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.PaymentAllocationTypeListConverter</class>
+        <class>org.apache.fineract.portfolio.loanproduct.domain.SupportedInterestRefundTypesListConverter</class>
+        <class>org.apache.fineract.portfolio.loanaccount.domain.LoanStatusConverter</class>
+
         <!-- Document Module Entities -->
         <class>org.apache.fineract.infrastructure.documentmanagement.domain.Document</class>
 
diff --git a/fineract-savings/src/main/resources/jpa/static-weaving/module/savings/persistence.xml b/fineract-savings/src/main/resources/jpa/static-weaving/module/savings/persistence.xml
index 60ec696bb..1e6e6db5b 100644
--- a/fineract-savings/src/main/resources/jpa/static-weaving/module/savings/persistence.xml
+++ b/fineract-savings/src/main/resources/jpa/static-weaving/module/savings/persistence.xml
@@ -92,7 +92,6 @@
         <class>org.apache.fineract.portfolio.interestratechart.domain.InterestIncentives</class>
         <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChart</class>
         <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartSlab</class>
-        <class>org.apache.fineract.portfolio.interestratechart.domain.InterestRateChartFields</class>
         <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentive</class>
         <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestIncentives</class>
         <class>org.apache.fineract.portfolio.savings.domain.DepositAccountInterestRateChart</class>