You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2022/09/01 06:36:43 UTC

[fineract] branch develop updated: FINERACT-1694: Avro schema adjustments

This is an automated email from the ASF dual-hosted git repository.

arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new fc875047e FINERACT-1694: Avro schema adjustments
fc875047e is described below

commit fc875047e66463856385f69c2d9c4142c388a8c9
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Wed Aug 31 21:56:00 2022 +0200

    FINERACT-1694: Avro schema adjustments
---
 .../client/v1/ClientCollateralManagementV1.avsc    |   7 +
 .../src/main/avro/client/v1/ClientDataV1.avsc      |  34 ++++
 .../main/avro/client/v1/ClientTimelineDataV1.avsc  |  12 ++
 .../fixeddeposit/v1/FixedDepositAccountDataV1.avsc |  46 +++++
 .../src/main/avro/generic/v1/CalendarDataV1.avsc   |  30 +++
 .../src/main/avro/generic/v1/CodeValueDataV1.avsc  |   6 +
 ...EventV1.avsc => CommandProcessingResultV1.avsc} |  15 +-
 .../src/main/avro/generic/v1/CurrencyDataV1.avsc   |   7 +
 .../src/main/avro/generic/v1/EnumOptionDataV1.avsc |   3 +
 .../src/main/avro/gl/v1/GLAccountDataV1.avsc       |  12 ++
 .../src/main/avro/group/v1/GroupGeneralDataV1.avsc |  16 ++
 .../src/main/avro/group/v1/GroupRoleDataV1.avsc    |   4 +
 .../src/main/avro/loan/v1/CollectionDataV1.avsc    |   8 +
 .../main/avro/loan/v1/DelinquencyBucketDataV1.avsc |   2 +
 .../main/avro/loan/v1/DelinquencyRangeDataV1.avsc  |   4 +
 .../src/main/avro/loan/v1/DisbursementDataV1.avsc  |   8 +
 .../src/main/avro/loan/v1/LoanAccountDataV1.avsc   |  79 ++++++++
 .../avro/loan/v1/LoanAccountSummaryDataV1.avsc     |  15 ++
 .../avro/loan/v1/LoanApplicationTimelineV1.avsc    |  30 +++
 .../src/main/avro/loan/v1/LoanChargeDataV1.avsc    |  27 +++
 .../main/avro/loan/v1/LoanChargePaidByDataV1.avsc  |   6 +
 .../avro/loan/v1/LoanInstallmentChargeDataV1.avsc  |   9 +
 .../loan/v1/LoanInterestRecalculationDataV1.avsc   |  18 ++
 .../LoanProductBorrowerCycleVariationDataV1.avsc   |   7 +
 .../src/main/avro/loan/v1/LoanProductDataV1.avsc   |  73 +++++++
 .../avro/loan/v1/LoanProductGuaranteeDataV1.avsc   |   5 +
 .../v1/LoanProductInterestRecalculationDataV1.avsc |  18 ++
 .../src/main/avro/loan/v1/LoanScheduleDataV1.avsc  |  17 ++
 .../avro/loan/v1/LoanSchedulePeriodDataV1.avsc     |  40 ++++
 .../main/avro/loan/v1/LoanStatusEnumDataV1.avsc    |  11 ++
 .../src/main/avro/loan/v1/LoanSummaryDataV1.avsc   |  37 ++++
 .../avro/loan/v1/LoanTermVariationsDataV1.avsc     |   7 +
 .../loan/v1/LoanTransactionAdjustmentDataV1.avsc   |   2 +
 .../main/avro/loan/v1/LoanTransactionDataV1.avsc   |  22 +++
 .../avro/loan/v1/LoanTransactionEnumDataV1.avsc    |  25 +++
 .../src/main/avro/office/v1/OfficeDataV1.avsc      |   8 +
 .../main/avro/payment/v1/PaymentDetailDataV1.avsc  |   7 +
 .../main/avro/payment/v1/PaymentTypeDataV1.avsc    |   5 +
 .../src/main/avro/portfolio/v1/ChargeDataV1.avsc   |  22 +++
 .../avro/portfolio/v1/PortfolioAccountDataV1.avsc  |  13 ++
 .../src/main/avro/portfolio/v1/RateDataV1.avsc     |   5 +
 .../v1/RecurringDepositAccountDataV1.avsc          |  51 +++++
 .../avro/savings/v1/AccountTransferDataV1.avsc     |  14 ++
 .../SavingsAccountApplicationTimelineDataV1.avsc   |  24 +++
 .../savings/v1/SavingsAccountChargeDataV1.avsc     |  26 +++
 .../v1/SavingsAccountChargesPaidByDataV1.avsc      |   3 +
 .../v1/SavingsAccountDataV1.avsc}                  | 218 +++++++++++----------
 .../savings/v1/SavingsAccountStatusEnumDataV1.avsc |  13 ++
 .../v1/SavingsAccountSubStatusEnumDataV1.avsc}     |  37 ++--
 .../savings/v1/SavingsAccountSummaryDataV1.avsc    |  17 ++
 .../v1/SavingsAccountTransactionDataV1.avsc        |  22 +++
 .../v1/SavingsAccountTransactionEnumDataV1.avsc    |  19 ++
 .../v1/ShareAccountApplicationTimelineDataV1.avsc} |  52 +++--
 ...eProductDataV1.avsc => ShareAccountDataV1.avsc} |  83 +++++---
 .../v1/ShareAccountStatusEnumDataV1.avsc}          |  45 ++---
 .../v1/ShareAccountSummaryDataV1.avsc}             |  47 +++--
 .../v1/ShareAccountTransactionDataV1.avsc}         |  56 +++---
 .../src/main/avro/share/v1/ShareProductDataV1.avsc |  18 ++
 .../share/v1/ShareProductMarketPriceDataV1.avsc    |   3 +
 59 files changed, 1204 insertions(+), 266 deletions(-)

diff --git a/fineract-avro-schemas/src/main/avro/client/v1/ClientCollateralManagementV1.avsc b/fineract-avro-schemas/src/main/avro/client/v1/ClientCollateralManagementV1.avsc
index acd66ac7d..f4f2da806 100644
--- a/fineract-avro-schemas/src/main/avro/client/v1/ClientCollateralManagementV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/client/v1/ClientCollateralManagementV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "quantity",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "pctToBase",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "unitPrice",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "total",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalCollateral",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/client/v1/ClientDataV1.avsc b/fineract-avro-schemas/src/main/avro/client/v1/ClientDataV1.avsc
index f9e6c3378..1a089db19 100644
--- a/fineract-avro-schemas/src/main/avro/client/v1/ClientDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/client/v1/ClientDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "subStatus",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activationDate",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "firstname",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "middlename",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastname",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fullname",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "displayName",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "mobileNo",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "emailAddress",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dateOfBirth",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "gender",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientType",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientClassification",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isStaff",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeId",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeName",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferToOfficeId",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferToOfficeName",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "imageId",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "imagePresent",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "staffId",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "staffName",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "savingsProductId",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "savingsProductName",
             "type": [
                 "null",
@@ -214,6 +244,7 @@
             ]
         },
         {
+            "default": null,
             "name": "savingsAccountId",
             "type": [
                 "null",
@@ -221,6 +252,7 @@
             ]
         },
         {
+            "default": null,
             "name": "legalForm",
             "type": [
                 "null",
@@ -228,6 +260,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientCollateralManagements",
             "type": [
                 "null",
@@ -238,6 +271,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groups",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/client/v1/ClientTimelineDataV1.avsc b/fineract-avro-schemas/src/main/avro/client/v1/ClientTimelineDataV1.avsc
index 96961cce1..611f81c6f 100644
--- a/fineract-avro-schemas/src/main/avro/client/v1/ClientTimelineDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/client/v1/ClientTimelineDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByUsername",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByFirstname",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByLastname",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedOnDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByUsername",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByFirstname",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByLastname",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedOnDate",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByUsername",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByFirstname",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByLastname",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/fixeddeposit/v1/FixedDepositAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/fixeddeposit/v1/FixedDepositAccountDataV1.avsc
index 453c267c8..09971d770 100644
--- a/fineract-avro-schemas/src/main/avro/fixeddeposit/v1/FixedDepositAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/fixeddeposit/v1/FixedDepositAccountDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupName",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositProductId",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositProductName",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerId",
             "type": [
                 "null",
@@ -81,6 +91,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -88,6 +99,7 @@
             ]
         },
         {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -95,6 +107,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -102,6 +115,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nominalAnnualInterestRate",
             "type": [
                 "null",
@@ -109,6 +123,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCompoundingPeriodType",
             "type": [
                 "null",
@@ -116,6 +131,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPostingPeriodType",
             "type": [
                 "null",
@@ -123,6 +139,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationType",
             "type": [
                 "null",
@@ -130,6 +147,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationDaysInYearType",
             "type": [
                 "null",
@@ -137,6 +155,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minRequiredOpeningBalance",
             "type": [
                 "null",
@@ -144,6 +163,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequency",
             "type": [
                 "null",
@@ -151,6 +171,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequencyType",
             "type": [
                 "null",
@@ -158,6 +179,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawalFeeForTransfers",
             "type": [
                 "null",
@@ -165,6 +187,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositType",
             "type": [
                 "null",
@@ -172,6 +195,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minBalanceForInterestCalculation",
             "type": [
                 "null",
@@ -179,6 +203,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withHoldTax",
             "type": [
                 "null",
@@ -186,6 +211,7 @@
             ]
         },
         {
+            "default": null,
             "name": "summary",
             "type": [
                 "null",
@@ -213,6 +239,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalApplicable",
             "type": [
                 "null",
@@ -220,6 +247,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalInterest",
             "type": [
                 "null",
@@ -227,6 +255,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalInterestOnType",
             "type": [
                 "null",
@@ -234,6 +263,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minDepositTerm",
             "type": [
                 "null",
@@ -241,6 +271,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxDepositTerm",
             "type": [
                 "null",
@@ -248,6 +279,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minDepositTermType",
             "type": [
                 "null",
@@ -255,6 +287,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxDepositTermType",
             "type": [
                 "null",
@@ -262,6 +295,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inMultiplesOfDepositTerm",
             "type": [
                 "null",
@@ -269,6 +303,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inMultiplesOfDepositTermType",
             "type": [
                 "null",
@@ -276,6 +311,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositAmount",
             "type": [
                 "null",
@@ -283,6 +319,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maturityAmount",
             "type": [
                 "null",
@@ -290,6 +327,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maturityDate",
             "type": [
                 "null",
@@ -297,6 +335,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositPeriod",
             "type": [
                 "null",
@@ -304,6 +343,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositPeriodFrequency",
             "type": [
                 "null",
@@ -311,6 +351,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activationCharge",
             "type": [
                 "null",
@@ -318,6 +359,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferToSavingsId",
             "type": [
                 "null",
@@ -325,6 +367,7 @@
             ]
         },
         {
+            "default": null,
             "name": "onAccountClosure",
             "type": [
                 "null",
@@ -332,6 +375,7 @@
             ]
         },
         {
+            "default": null,
             "name": "linkedAccount",
             "type": [
                 "null",
@@ -339,6 +383,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferInterestToSavings",
             "type": [
                 "null",
@@ -346,6 +391,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferToSavingsAccount",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/generic/v1/CalendarDataV1.avsc b/fineract-avro-schemas/src/main/avro/generic/v1/CalendarDataV1.avsc
index 6bf5d4bac..9aa8df4b4 100644
--- a/fineract-avro-schemas/src/main/avro/generic/v1/CalendarDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/generic/v1/CalendarDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "calendarInstanceId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "entityId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "entityType",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "title",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "location",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "startDate",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "endDate",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "meetingTime",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "duration",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "type",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repeating",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recurrence",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "frequency",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interval",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repeatsOnDay",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repeatsOnNthDayOfMonth",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "remindBy",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "firstReminder",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "secondReminder",
             "type": [
                 "null",
@@ -171,6 +192,7 @@
             ]
         },
         {
+            "default": null,
             "name": "humanReadable",
             "type": [
                 "null",
@@ -178,6 +200,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recentEligibleMeetingDate",
             "type": [
                 "null",
@@ -185,6 +208,7 @@
             ]
         },
         {
+            "default": null,
             "name": "createdDate",
             "type": [
                 "null",
@@ -192,6 +216,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastUpdatedDate",
             "type": [
                 "null",
@@ -199,6 +224,7 @@
             ]
         },
         {
+            "default": null,
             "name": "createdByUserId",
             "type": [
                 "null",
@@ -206,6 +232,7 @@
             ]
         },
         {
+            "default": null,
             "name": "createdByUsername",
             "type": [
                 "null",
@@ -213,6 +240,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastUpdatedByUserId",
             "type": [
                 "null",
@@ -220,6 +248,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastUpdatedByUsername",
             "type": [
                 "null",
@@ -227,6 +256,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repeatsOnDayOfMonth",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/generic/v1/CodeValueDataV1.avsc b/fineract-avro-schemas/src/main/avro/generic/v1/CodeValueDataV1.avsc
index 71bc7e28d..6131605cc 100644
--- a/fineract-avro-schemas/src/main/avro/generic/v1/CodeValueDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/generic/v1/CodeValueDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "position",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "mandatory",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultEventV1.avsc b/fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultV1.avsc
similarity index 81%
rename from fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultEventV1.avsc
rename to fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultV1.avsc
index 0841c3ae9..86a483dca 100644
--- a/fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultEventV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/generic/v1/CommandProcessingResultV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "CommandProcessingResultEventV1",
+    "name": "CommandProcessingResultV1",
     "namespace": "org.apache.fineract.avro.generic.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "commandId",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanId",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "savingsId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "resourceId",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "subResourceId",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionId",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "resourceIdentifier",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "gsimId",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "glimId",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/generic/v1/CurrencyDataV1.avsc b/fineract-avro-schemas/src/main/avro/generic/v1/CurrencyDataV1.avsc
index a9e53d2d3..07c0835fa 100644
--- a/fineract-avro-schemas/src/main/avro/generic/v1/CurrencyDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/generic/v1/CurrencyDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "decimalPlaces",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inMultiplesOf",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "displaySymbol",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nameCode",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "displayLabel",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/generic/v1/EnumOptionDataV1.avsc b/fineract-avro-schemas/src/main/avro/generic/v1/EnumOptionDataV1.avsc
index d12035753..5080f0fb4 100644
--- a/fineract-avro-schemas/src/main/avro/generic/v1/EnumOptionDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/generic/v1/EnumOptionDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "value",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc
index 737ebf257..b9c5ef5de 100644
--- a/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "parentId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "glCode",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disabled",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "manualEntriesAllowed",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "type",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "usage",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nameDecorated",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "tagId",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "organizationRunningBalance",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/group/v1/GroupGeneralDataV1.avsc b/fineract-avro-schemas/src/main/avro/group/v1/GroupGeneralDataV1.avsc
index bd2d3a6be..2f51475b0 100644
--- a/fineract-avro-schemas/src/main/avro/group/v1/GroupGeneralDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/group/v1/GroupGeneralDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activationDate",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeId",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeName",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "centerId",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "centerName",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "staffId",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "staffName",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "hierarchy",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupLevel",
             "type": [
                 "null",
@@ -129,6 +144,7 @@
             ]
         },
         {
+            "default": null,
             "name": "collectionMeetingCalendar",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/group/v1/GroupRoleDataV1.avsc b/fineract-avro-schemas/src/main/avro/group/v1/GroupRoleDataV1.avsc
index 3e5756f3a..a253e6c28 100644
--- a/fineract-avro-schemas/src/main/avro/group/v1/GroupRoleDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/group/v1/GroupRoleDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/CollectionDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/CollectionDataV1.avsc
index e8dca556a..20bdfccdc 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/CollectionDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/CollectionDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "availableDisbursementAmount",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "pastDueDays",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nextPaymentDueDate",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquentDays",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquentDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquentAmount",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastPaymentDate",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastPaymentAmount",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyBucketDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyBucketDataV1.avsc
index 4f7b5d117..20dae32c3 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyBucketDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyBucketDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyRangeDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyRangeDataV1.avsc
index 4c232066a..0fc6adc01 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyRangeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/DelinquencyRangeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "classification",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumAgeDays",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maximumAgeDays",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/DisbursementDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/DisbursementDataV1.avsc
index 6c216a2c6..2be3996a8 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/DisbursementDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/DisbursementDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "expectedDisbursementDate",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "actualDisbursementDate",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principal",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "netDisbursalAmount",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanChargeId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeAmount",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waivedChargeAmount",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc
index 2dcc6a49e..3ea653e6f 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "subStatus",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientAccountNo",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientOfficeId",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanProductId",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanProductName",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanProductDescription",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isLoanProductLinkedToFloatingRate",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fundId",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fundName",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanPurposeId",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanPurposeName",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanOfficerId",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanOfficerName",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanType",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principal",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedPrincipal",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "proposedPrincipal",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "netDisbursalAmount",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "termFrequency",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "termPeriodFrequencyType",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "numberOfRepayments",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentEvery",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentFrequencyType",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentFrequencyNthDayType",
             "type": [
                 "null",
@@ -214,6 +244,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentFrequencyDayOfWeekType",
             "type": [
                 "null",
@@ -221,6 +252,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRatePerPeriod",
             "type": [
                 "null",
@@ -228,6 +260,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRateFrequencyType",
             "type": [
                 "null",
@@ -235,6 +268,7 @@
             ]
         },
         {
+            "default": null,
             "name": "annualInterestRate",
             "type": [
                 "null",
@@ -242,6 +276,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isFloatingInterestRate",
             "type": [
                 "null",
@@ -249,6 +284,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRateDifferential",
             "type": [
                 "null",
@@ -256,6 +292,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amortizationType",
             "type": [
                 "null",
@@ -263,6 +300,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestType",
             "type": [
                 "null",
@@ -270,6 +308,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationPeriodType",
             "type": [
                 "null",
@@ -277,6 +316,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowPartialPeriodInterestCalculation",
             "type": [
                 "null",
@@ -284,6 +324,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inArrearsTolerance",
             "type": [
                 "null",
@@ -291,6 +332,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionProcessingStrategyId",
             "type": [
                 "null",
@@ -298,6 +340,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionProcessingStrategyName",
             "type": [
                 "null",
@@ -305,6 +348,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnPrincipalPayment",
             "type": [
                 "null",
@@ -312,6 +356,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recurringMoratoriumOnPrincipalPeriods",
             "type": [
                 "null",
@@ -319,6 +364,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnInterestPayment",
             "type": [
                 "null",
@@ -326,6 +372,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnInterestCharged",
             "type": [
                 "null",
@@ -333,6 +380,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnArrearsAgeing",
             "type": [
                 "null",
@@ -340,6 +388,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestChargedFromDate",
             "type": [
                 "null",
@@ -347,6 +396,7 @@
             ]
         },
         {
+            "default": null,
             "name": "expectedFirstRepaymentOnDate",
             "type": [
                 "null",
@@ -354,6 +404,7 @@
             ]
         },
         {
+            "default": null,
             "name": "syncDisbursementWithMeeting",
             "type": [
                 "null",
@@ -361,6 +412,7 @@
             ]
         },
         {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -368,6 +420,7 @@
             ]
         },
         {
+            "default": null,
             "name": "summary",
             "type": [
                 "null",
@@ -375,6 +428,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentSchedule",
             "type": [
                 "null",
@@ -402,6 +456,7 @@
             ]
         },
         {
+            "default": null,
             "name": "meeting",
             "type": [
                 "null",
@@ -419,6 +474,7 @@
             ]
         },
         {
+            "default": null,
             "name": "originalSchedule",
             "type": [
                 "null",
@@ -426,6 +482,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOverpaid",
             "type": [
                 "null",
@@ -433,6 +490,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanCounter",
             "type": [
                 "null",
@@ -440,6 +498,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanProductCounter",
             "type": [
                 "null",
@@ -447,6 +506,7 @@
             ]
         },
         {
+            "default": null,
             "name": "linkedAccount",
             "type": [
                 "null",
@@ -464,6 +524,7 @@
             ]
         },
         {
+            "default": null,
             "name": "multiDisburseLoan",
             "type": [
                 "null",
@@ -471,6 +532,7 @@
             ]
         },
         {
+            "default": null,
             "name": "canDefineInstallmentAmount",
             "type": [
                 "null",
@@ -478,6 +540,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fixedEmiAmount",
             "type": [
                 "null",
@@ -485,6 +548,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxOutstandingLoanBalance",
             "type": [
                 "null",
@@ -492,6 +556,7 @@
             ]
         },
         {
+            "default": null,
             "name": "canDisburse",
             "type": [
                 "null",
@@ -519,6 +584,7 @@
             ]
         },
         {
+            "default": null,
             "name": "canUseForTopup",
             "type": [
                 "null",
@@ -526,6 +592,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isTopup",
             "type": [
                 "null",
@@ -533,6 +600,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closureLoanId",
             "type": [
                 "null",
@@ -540,6 +608,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closureLoanAccountNo",
             "type": [
                 "null",
@@ -547,6 +616,7 @@
             ]
         },
         {
+            "default": null,
             "name": "topupAmount",
             "type": [
                 "null",
@@ -554,6 +624,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inArrears",
             "type": [
                 "null",
@@ -561,6 +632,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isNPA",
             "type": [
                 "null",
@@ -578,6 +650,7 @@
             ]
         },
         {
+            "default": null,
             "name": "daysInMonthType",
             "type": [
                 "null",
@@ -585,6 +658,7 @@
             ]
         },
         {
+            "default": null,
             "name": "daysInYearType",
             "type": [
                 "null",
@@ -592,6 +666,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isInterestRecalculationEnabled",
             "type": [
                 "null",
@@ -599,6 +674,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRecalculationData",
             "type": [
                 "null",
@@ -606,6 +682,7 @@
             ]
         },
         {
+            "default": null,
             "name": "createStandingInstructionAtDisbursement",
             "type": [
                 "null",
@@ -613,6 +690,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquent",
             "type": [
                 "null",
@@ -620,6 +698,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquencyRange",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountSummaryDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountSummaryDataV1.avsc
index 746fc5dba..afd4e7145 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountSummaryDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanAccountSummaryDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "parentAccountNumber",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productName",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "shortProductName",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanType",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanCycle",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inArrears",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "originalLoan",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanBalance",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountPaid",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanApplicationTimelineV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanApplicationTimelineV1.avsc
index 4c1059bb0..cc1cfc04e 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanApplicationTimelineV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanApplicationTimelineV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByUsername",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByFirstname",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByLastname",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedOnDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByUsername",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByFirstname",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByLastname",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnOnDate",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByUsername",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByFirstname",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByLastname",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedOnDate",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByUsername",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByFirstname",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByLastname",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "expectedDisbursementDate",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "actualDisbursementDate",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disbursedByUsername",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disbursedByFirstname",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disbursedByLastname",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedOnDate",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByUsername",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByFirstname",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByLastname",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "expectedMaturityDate",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeOffOnDate",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeOffByUsername",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeOffByFirstname",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeOffByLastname",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargeDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargeDataV1.avsc
index 092eeef70..3b5d47544 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeTimeType",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dueDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeCalculationType",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "percentage",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountPercentageAppliedTo",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountPaid",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountWaived",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountWrittenOff",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountOutstanding",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountOrPercentage",
             "type": [
                 "null",
@@ -119,6 +134,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penalty",
             "type": [
                 "null",
@@ -126,6 +142,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargePaymentMode",
             "type": [
                 "null",
@@ -133,6 +150,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paid",
             "type": [
                 "null",
@@ -140,6 +158,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waived",
             "type": [
                 "null",
@@ -147,6 +166,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargePayable",
             "type": [
                 "null",
@@ -154,6 +174,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanId",
             "type": [
                 "null",
@@ -161,6 +182,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minCap",
             "type": [
                 "null",
@@ -168,6 +190,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxCap",
             "type": [
                 "null",
@@ -175,6 +198,7 @@
             ]
         },
         {
+            "default": null,
             "name": "installmentChargeData",
             "type": [
                 "null",
@@ -182,6 +206,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountAccrued",
             "type": [
                 "null",
@@ -189,6 +214,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountUnrecognized",
             "type": [
                 "null",
@@ -196,6 +222,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargePaidByDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargePaidByDataV1.avsc
index 6f2da5c68..13c20ced9 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargePaidByDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanChargePaidByDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "installmentNumber",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionId",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanInstallmentChargeDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanInstallmentChargeDataV1.avsc
index 81b087f4c..cfe4861de 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanInstallmentChargeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanInstallmentChargeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "installmentNumber",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dueDate",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountOutstanding",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountWaived",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paid",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waived",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountAccrued",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountUnrecognized",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanInterestRecalculationDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanInterestRecalculationDataV1.avsc
index 1747c4526..c799b4240 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanInterestRecalculationDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanInterestRecalculationDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRecalculationCompoundingType",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rescheduleStrategyType",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "calendarData",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyType",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyInterval",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyNthDay",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyWeekday",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyOnDay",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyType",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyInterval",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyNthDay",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyWeekday",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyOnDay",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isCompoundingToBePostedAsTransaction",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "compoundingCalendarData",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowCompoundingOnEod",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductBorrowerCycleVariationDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductBorrowerCycleVariationDataV1.avsc
index 2c4190c5b..9d7aa5252 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductBorrowerCycleVariationDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductBorrowerCycleVariationDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "borrowerCycleNumber",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paramType",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "valueConditionType",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minValue",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxValue",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "defaultValue",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc
index 6ca1d9bc9..3e6770fa8 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "shortName",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fundId",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fundName",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "includeInBorrowerCycle",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "useBorrowerCycle",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "startDate",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closeDate",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principal",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minPrincipal",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxPrincipal",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "numberOfRepayments",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minNumberOfRepayments",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxNumberOfRepayments",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentEvery",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentFrequencyType",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRatePerPeriod",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minInterestRatePerPeriod",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxInterestRatePerPeriod",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRateFrequencyType",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "annualInterestRate",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isLinkedToFloatingInterestRates",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "floatingRateId",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "floatingRateName",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRateDifferential",
             "type": [
                 "null",
@@ -214,6 +244,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minDifferentialLendingRate",
             "type": [
                 "null",
@@ -221,6 +252,7 @@
             ]
         },
         {
+            "default": null,
             "name": "defaultDifferentialLendingRate",
             "type": [
                 "null",
@@ -228,6 +260,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxDifferentialLendingRate",
             "type": [
                 "null",
@@ -235,6 +268,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isFloatingInterestRateCalculationAllowed",
             "type": [
                 "null",
@@ -242,6 +276,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowVariableInstallments",
             "type": [
                 "null",
@@ -249,6 +284,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumGap",
             "type": [
                 "null",
@@ -256,6 +292,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maximumGap",
             "type": [
                 "null",
@@ -263,6 +300,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amortizationType",
             "type": [
                 "null",
@@ -270,6 +308,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestType",
             "type": [
                 "null",
@@ -277,6 +316,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationPeriodType",
             "type": [
                 "null",
@@ -284,6 +324,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowPartialPeriodInterestCalcualtion",
             "type": [
                 "null",
@@ -291,6 +332,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inArrearsTolerance",
             "type": [
                 "null",
@@ -298,6 +340,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionProcessingStrategyId",
             "type": [
                 "null",
@@ -305,6 +348,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionProcessingStrategyName",
             "type": [
                 "null",
@@ -312,6 +356,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnPrincipalPayment",
             "type": [
                 "null",
@@ -319,6 +364,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recurringMoratoriumOnPrincipalPeriods",
             "type": [
                 "null",
@@ -326,6 +372,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnInterestPayment",
             "type": [
                 "null",
@@ -333,6 +380,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnInterestCharged",
             "type": [
                 "null",
@@ -340,6 +388,7 @@
             ]
         },
         {
+            "default": null,
             "name": "graceOnArrearsAgeing",
             "type": [
                 "null",
@@ -347,6 +396,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overdueDaysForNPA",
             "type": [
                 "null",
@@ -354,6 +404,7 @@
             ]
         },
         {
+            "default": null,
             "name": "daysInMonthType",
             "type": [
                 "null",
@@ -361,6 +412,7 @@
             ]
         },
         {
+            "default": null,
             "name": "daysInYearType",
             "type": [
                 "null",
@@ -368,6 +420,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isInterestRecalculationEnabled",
             "type": [
                 "null",
@@ -375,6 +428,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRecalculationData",
             "type": [
                 "null",
@@ -382,6 +436,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumDaysBetweenDisbursalAndFirstRepayment",
             "type": [
                 "null",
@@ -389,6 +444,7 @@
             ]
         },
         {
+            "default": null,
             "name": "canDefineInstallmentAmount",
             "type": [
                 "null",
@@ -396,6 +452,7 @@
             ]
         },
         {
+            "default": null,
             "name": "installmentAmountInMultiplesOf",
             "type": [
                 "null",
@@ -443,6 +500,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isRatesEnabled",
             "type": [
                 "null",
@@ -460,6 +518,7 @@
             ]
         },
         {
+            "default": null,
             "name": "multiDisburseLoan",
             "type": [
                 "null",
@@ -467,6 +526,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxTrancheCount",
             "type": [
                 "null",
@@ -474,6 +534,7 @@
             ]
         },
         {
+            "default": null,
             "name": "outstandingLoanBalance",
             "type": [
                 "null",
@@ -481,6 +542,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disallowExpectedDisbursements",
             "type": [
                 "null",
@@ -488,6 +550,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowApprovedDisbursedAmountsOverApplied",
             "type": [
                 "null",
@@ -495,6 +558,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overAppliedCalculationType",
             "type": [
                 "null",
@@ -502,6 +566,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overAppliedNumber",
             "type": [
                 "null",
@@ -509,6 +574,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalThresholdForLastInstallment",
             "type": [
                 "null",
@@ -516,6 +582,7 @@
             ]
         },
         {
+            "default": null,
             "name": "holdGuaranteeFunds",
             "type": [
                 "null",
@@ -523,6 +590,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productGuaranteeData",
             "type": [
                 "null",
@@ -530,6 +598,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountMovesOutOfNPAOnlyOnArrearsCompletion",
             "type": [
                 "null",
@@ -537,6 +606,7 @@
             ]
         },
         {
+            "default": null,
             "name": "syncExpectedWithDisbursementDate",
             "type": [
                 "null",
@@ -544,6 +614,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isEqualAmortization",
             "type": [
                 "null",
@@ -551,6 +622,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fixedPrincipalPercentagePerInstallment",
             "type": [
                 "null",
@@ -558,6 +630,7 @@
             ]
         },
         {
+            "default": null,
             "name": "delinquencyBucket",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductGuaranteeDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductGuaranteeDataV1.avsc
index 1ef586202..886a8dc8f 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductGuaranteeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductGuaranteeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "mandatoryGuarantee",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumGuaranteeFromOwnFunds",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumGuaranteeFromGuarantor",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductInterestRecalculationDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductInterestRecalculationDataV1.avsc
index 32444c921..483116378 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductInterestRecalculationDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanProductInterestRecalculationDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestRecalculationCompoundingType",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rescheduleStrategyType",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyType",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyInterval",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyNthDay",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyWeekday",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationRestFrequencyOnDay",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyType",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyInterval",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyNthDay",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyWeekday",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recalculationCompoundingFrequencyOnDay",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isArrearsBasedOnOriginalSchedule",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isCompoundingToBePostedAsTransaction",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosureInterestCalculationStrategy",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowCompoundingOnEod",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanScheduleDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanScheduleDataV1.avsc
index 73d4766a7..b836b7395 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanScheduleDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanScheduleDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "loanTermInDays",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPrincipalDisbursed",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPrincipalExpected",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPrincipalPaid",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalInterestCharged",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalFeeChargesCharged",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPenaltyChargesCharged",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWaived",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWrittenOff",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalRepaymentExpected",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalRepayment",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPaidInAdvance",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPaidLate",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOutstanding",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "periods",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "futurePeriods",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSchedulePeriodDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSchedulePeriodDataV1.avsc
index 919d96272..f7a0dd15e 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSchedulePeriodDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSchedulePeriodDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "period",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromDate",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dueDate",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "obligationsMetOnDate",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "complete",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "daysInPeriod",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalDisbursed",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalOriginalDue",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalDue",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalPaid",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalWrittenOff",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalOutstanding",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalLoanBalanceOutstanding",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestOriginalDue",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestDue",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPaid",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestWaived",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestWrittenOff",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestOutstanding",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesDue",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesPaid",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesWaived",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesWrittenOff",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesOutstanding",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesDue",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesPaid",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesWaived",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesWrittenOff",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesOutstanding",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOriginalDueForPeriod",
             "type": [
                 "null",
@@ -214,6 +244,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalDueForPeriod",
             "type": [
                 "null",
@@ -221,6 +252,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPaidForPeriod",
             "type": [
                 "null",
@@ -228,6 +260,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPaidInAdvanceForPeriod",
             "type": [
                 "null",
@@ -235,6 +268,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPaidLateForPeriod",
             "type": [
                 "null",
@@ -242,6 +276,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWaivedForPeriod",
             "type": [
                 "null",
@@ -249,6 +284,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWrittenOffForPeriod",
             "type": [
                 "null",
@@ -256,6 +292,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOutstandingForPeriod",
             "type": [
                 "null",
@@ -263,6 +300,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOverdue",
             "type": [
                 "null",
@@ -270,6 +308,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalActualCostOfLoanForPeriod",
             "type": [
                 "null",
@@ -277,6 +316,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalInstallmentAmountForPeriod",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
index 052e6b9dc..4a075ad65 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "pendingApproval",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waitingForDisbursal",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedObligationsMet",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedWrittenOff",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedRescheduled",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closed",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overpaid",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc
index ac0330717..88dd74402 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanSummaryDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalDisbursed",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalPaid",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalWrittenOff",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalOutstanding",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalOverdue",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCharged",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPaid",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestWaived",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestWrittenOff",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestOutstanding",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestOverdue",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesCharged",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesDueAtDisbursementCharged",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesPaid",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesWaived",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesWrittenOff",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesOutstanding",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesOverdue",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesCharged",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesPaid",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesWaived",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesWrittenOff",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesOutstanding",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesOverdue",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalExpectedRepayment",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalRepayment",
             "type": [
                 "null",
@@ -193,6 +220,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalExpectedCostOfLoan",
             "type": [
                 "null",
@@ -200,6 +228,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalCostOfLoan",
             "type": [
                 "null",
@@ -207,6 +236,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWaived",
             "type": [
                 "null",
@@ -214,6 +244,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWrittenOff",
             "type": [
                 "null",
@@ -221,6 +252,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOutstanding",
             "type": [
                 "null",
@@ -228,6 +260,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOverdue",
             "type": [
                 "null",
@@ -235,6 +268,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalRecovered",
             "type": [
                 "null",
@@ -242,6 +276,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overdueSinceDate",
             "type": [
                 "null",
@@ -249,6 +284,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeoffReasonId",
             "type": [
                 "null",
@@ -256,6 +292,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeoffReason",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTermVariationsDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTermVariationsDataV1.avsc
index 257ee05e4..ce5d8bb4b 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTermVariationsDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTermVariationsDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "termType",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "termVariationApplicableFrom",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "decimalValue",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dateValue",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isSpecificToInstallment",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isProcessed",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionAdjustmentDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionAdjustmentDataV1.avsc
index d58630e8d..1853e956a 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionAdjustmentDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionAdjustmentDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "transactionToAdjust",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "newTransactionDetail",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionDataV1.avsc
index 316c3b7a4..216d75b6e 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "officeName",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "type",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "date",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paymentDetailData",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "netDisbursalAmount",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "principalPortion",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPortion",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeChargesPortion",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penaltyChargesPortion",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overpaymentPortion",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "unrecognizedIncomePortion",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transfer",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fixedEmiAmount",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "outstandingLoanBalance",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "manuallyReversed",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "possibleNextRepaymentDate",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionEnumDataV1.avsc
index ab2dee641..c86d54d31 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/loan/v1/LoanTransactionEnumDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "value",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "disbursement",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repaymentAtDisbursement",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "repayment",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "merchantIssuedRefund",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "payoutRefund",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "goodwillCredit",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeRefund",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "contra",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waiveInterest",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "waiveCharges",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accrual",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writeOff",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recoveryRepayment",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "initiateTransfer",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approveTransfer",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawTransfer",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectTransfer",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargePayment",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "refund",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "refundForActiveLoans",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "creditBalanceRefund",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeback",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/office/v1/OfficeDataV1.avsc b/fineract-avro-schemas/src/main/avro/office/v1/OfficeDataV1.avsc
index 064c1db44..b93be4215 100644
--- a/fineract-avro-schemas/src/main/avro/office/v1/OfficeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/office/v1/OfficeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nameDecorated",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "openingDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "hierarchy",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "parentId",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "parentName",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/payment/v1/PaymentDetailDataV1.avsc b/fineract-avro-schemas/src/main/avro/payment/v1/PaymentDetailDataV1.avsc
index f4c8ae6df..d0eca2b27 100644
--- a/fineract-avro-schemas/src/main/avro/payment/v1/PaymentDetailDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/payment/v1/PaymentDetailDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paymentType",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNumber",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "checkNumber",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "routingCode",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "receiptNumber",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "bankNumber",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/payment/v1/PaymentTypeDataV1.avsc b/fineract-avro-schemas/src/main/avro/payment/v1/PaymentTypeDataV1.avsc
index 54f76f302..a1a02919c 100644
--- a/fineract-avro-schemas/src/main/avro/payment/v1/PaymentTypeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/payment/v1/PaymentTypeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isCashPayment",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "position",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/portfolio/v1/ChargeDataV1.avsc b/fineract-avro-schemas/src/main/avro/portfolio/v1/ChargeDataV1.avsc
index 7b280b597..a7a2440b3 100644
--- a/fineract-avro-schemas/src/main/avro/portfolio/v1/ChargeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/portfolio/v1/ChargeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penalty",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "freeWithdrawal",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "freeWithdrawalChargeFrequency",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "restartFrequency",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "restartFrequencyEnum",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isPaymentType",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paymentTypeOptions",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeTimeType",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeAppliesTo",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeCalculationType",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargePaymentMode",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeOnMonthDay",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeInterval",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minCap",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxCap",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeFrequency",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "incomeOrLiabilityAccount",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc
index d93348d1f..593b48208 100644
--- a/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupName",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productName",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerId",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerName",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amtForTransfer",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/portfolio/v1/RateDataV1.avsc b/fineract-avro-schemas/src/main/avro/portfolio/v1/RateDataV1.avsc
index 37d8407df..f11f8c459 100644
--- a/fineract-avro-schemas/src/main/avro/portfolio/v1/RateDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/portfolio/v1/RateDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "percentage",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productApply",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc
index 0c359069c..1c4b2b4e4 100644
--- a/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupId",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupName",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositProductId",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositProductName",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerId",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerName",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nominalAnnualInterestRate",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCompoundingPeriodType",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPostingPeriodType",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationType",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationDaysInYearType",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minRequiredOpeningBalance",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequency",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequencyType",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawalFeeForTransfers",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositType",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minBalanceForInterestCalculation",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withHoldTax",
             "type": [
                 "null",
@@ -186,6 +212,7 @@
             ]
         },
         {
+            "default": null,
             "name": "summary",
             "type": [
                 "null",
@@ -213,6 +240,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalApplicable",
             "type": [
                 "null",
@@ -220,6 +248,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalInterest",
             "type": [
                 "null",
@@ -227,6 +256,7 @@
             ]
         },
         {
+            "default": null,
             "name": "preClosurePenalInterestOnType",
             "type": [
                 "null",
@@ -234,6 +264,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minDepositTerm",
             "type": [
                 "null",
@@ -241,6 +272,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxDepositTerm",
             "type": [
                 "null",
@@ -248,6 +280,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minDepositTermType",
             "type": [
                 "null",
@@ -255,6 +288,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maxDepositTermType",
             "type": [
                 "null",
@@ -262,6 +296,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inMultiplesOfDepositTerm",
             "type": [
                 "null",
@@ -269,6 +304,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inMultiplesOfDepositTermType",
             "type": [
                 "null",
@@ -276,6 +312,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositAmount",
             "type": [
                 "null",
@@ -283,6 +320,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maturityAmount",
             "type": [
                 "null",
@@ -290,6 +328,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maturityDate",
             "type": [
                 "null",
@@ -297,6 +336,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositPeriod",
             "type": [
                 "null",
@@ -304,6 +344,7 @@
             ]
         },
         {
+            "default": null,
             "name": "depositPeriodFrequency",
             "type": [
                 "null",
@@ -311,6 +352,7 @@
             ]
         },
         {
+            "default": null,
             "name": "mandatoryRecommendedDepositAmount",
             "type": [
                 "null",
@@ -318,6 +360,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOverdueAmount",
             "type": [
                 "null",
@@ -325,6 +368,7 @@
             ]
         },
         {
+            "default": null,
             "name": "noOfOverdueInstallments",
             "type": [
                 "null",
@@ -332,6 +376,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isMandatoryDeposit",
             "type": [
                 "null",
@@ -339,6 +384,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowWithdrawal",
             "type": [
                 "null",
@@ -346,6 +392,7 @@
             ]
         },
         {
+            "default": null,
             "name": "adjustAdvanceTowardsFuturePayments",
             "type": [
                 "null",
@@ -353,6 +400,7 @@
             ]
         },
         {
+            "default": null,
             "name": "expectedFirstDepositOnDate",
             "type": [
                 "null",
@@ -360,6 +408,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isCalendarInherited",
             "type": [
                 "null",
@@ -367,6 +416,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recurringFrequency",
             "type": [
                 "null",
@@ -374,6 +424,7 @@
             ]
         },
         {
+            "default": null,
             "name": "recurringFrequencyType",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/AccountTransferDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/AccountTransferDataV1.avsc
index 748199306..69b0aad93 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/AccountTransferDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/AccountTransferDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "reversed",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferAmount",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferDescription",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromOffice",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromClient",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromAccountType",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromAccount",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "toOffice",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "toClient",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "toAccountType",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "toAccount",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc
index 8cf070280..4d5463efc 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByUsername",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByFirstname",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByLastname",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedOnDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByUsername",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByFirstname",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByLastname",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnOnDate",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByUsername",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByFirstname",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByLastname",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedOnDate",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByUsername",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByFirstname",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByLastname",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedOnDate",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByUsername",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByFirstname",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByLastname",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedOnDate",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByUsername",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByFirstname",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByLastname",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargeDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargeDataV1.avsc
index 8639f57a1..4a0c4684b 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargeDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargeDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeId",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeTimeType",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dueDate",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeOnMonthDay",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeInterval",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeCalculationType",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "percentage",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountPercentageAppliedTo",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountPaid",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountWaived",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountWrittenOff",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountOutstanding",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountOrPercentage",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "penalty",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isActive",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isFreeWithdrawal",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "freeWithdrawalChargeFrequency",
             "type": [
                 "null",
@@ -158,6 +180,7 @@
             ]
         },
         {
+            "default": null,
             "name": "restartFrequency",
             "type": [
                 "null",
@@ -165,6 +188,7 @@
             ]
         },
         {
+            "default": null,
             "name": "restartFrequencyEnum",
             "type": [
                 "null",
@@ -172,6 +196,7 @@
             ]
         },
         {
+            "default": null,
             "name": "inactivationDate",
             "type": [
                 "null",
@@ -179,6 +204,7 @@
             ]
         },
         {
+            "default": null,
             "name": "chargeData",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargesPaidByDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargesPaidByDataV1.avsc
index c3943aa17..b99b5c225 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargesPaidByDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountChargesPaidByDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "chargeId",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "savingsAccountChargeData",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountDataV1.avsc
similarity index 72%
copy from fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountDataV1.avsc
index 0c359069c..62f68c180 100644
--- a/fineract-avro-schemas/src/main/avro/recurringdeposit/v1/RecurringDepositAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "RecurringDepositAccountDataV1",
-    "namespace": "org.apache.fineract.avro.recurringdeposit.v1",
+    "name": "SavingsAccountDataV1",
+    "namespace": "org.apache.fineract.avro.savings.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,6 +20,15 @@
             ]
         },
         {
+            "default": null,
+            "name": "depositType",
+            "type": [
+                "null",
+                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
+            ]
+        },
+        {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -25,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupId",
             "type": [
                 "null",
@@ -32,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "groupName",
             "type": [
                 "null",
@@ -39,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientId",
             "type": [
                 "null",
@@ -46,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "clientName",
             "type": [
                 "null",
@@ -53,20 +68,23 @@
             ]
         },
         {
-            "name": "depositProductId",
+            "default": null,
+            "name": "savingsProductId",
             "type": [
                 "null",
                 "int"
             ]
         },
         {
-            "name": "depositProductName",
+            "default": null,
+            "name": "savingsProductName",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
+            "default": null,
             "name": "fieldOfficerId",
             "type": [
                 "null",
@@ -81,6 +99,7 @@
             ]
         },
         {
+            "default": null,
             "name": "status",
             "type": [
                 "null",
@@ -88,6 +107,23 @@
             ]
         },
         {
+            "default": null,
+            "name": "subStatus",
+            "type": [
+                "null",
+                "org.apache.fineract.avro.savings.v1.SavingsAccountSubStatusEnumDataV1"
+            ]
+        },
+        {
+            "default": null,
+            "name": "reasonForBlock",
+            "type": [
+                "null",
+                "string"
+            ]
+        },
+        {
+            "default": null,
             "name": "timeline",
             "type": [
                 "null",
@@ -95,6 +131,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -102,6 +139,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nominalAnnualInterestRate",
             "type": [
                 "null",
@@ -109,6 +147,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCompoundingPeriodType",
             "type": [
                 "null",
@@ -116,6 +155,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPostingPeriodType",
             "type": [
                 "null",
@@ -123,6 +163,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationType",
             "type": [
                 "null",
@@ -130,6 +171,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestCalculationDaysInYearType",
             "type": [
                 "null",
@@ -137,6 +179,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minRequiredOpeningBalance",
             "type": [
                 "null",
@@ -144,6 +187,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequency",
             "type": [
                 "null",
@@ -151,6 +195,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriodFrequencyType",
             "type": [
                 "null",
@@ -158,6 +203,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawalFeeForTransfers",
             "type": [
                 "null",
@@ -165,219 +211,183 @@
             ]
         },
         {
-            "name": "depositType",
+            "default": null,
+            "name": "allowOverdraft",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
+                "boolean"
             ]
         },
         {
-            "name": "minBalanceForInterestCalculation",
+            "default": null,
+            "name": "overdraftLimit",
             "type": [
                 "null",
                 "bigdecimal"
             ]
         },
         {
-            "name": "withHoldTax",
-            "type": [
-                "null",
-                "boolean"
-            ]
-        },
-        {
-            "name": "summary",
+            "default": null,
+            "name": "minRequiredBalance",
             "type": [
                 "null",
-                "org.apache.fineract.avro.savings.v1.SavingsAccountSummaryDataV1"
+                "bigdecimal"
             ]
         },
         {
-            "name": "transactions",
+            "default": null,
+            "name": "enforceMinRequiredBalance",
             "type": [
                 "null",
-                {
-                    "type": "array",
-                    "items": "org.apache.fineract.avro.savings.v1.SavingsAccountTransactionDataV1"
-                }
+                "boolean"
             ]
         },
         {
-            "name": "charges",
+            "default": null,
+            "name": "maxAllowedLienLimit",
             "type": [
                 "null",
-                {
-                    "type": "array",
-                    "items": "org.apache.fineract.avro.savings.v1.SavingsAccountChargeDataV1"
-                }
+                "bigdecimal"
             ]
         },
         {
-            "name": "preClosurePenalApplicable",
+            "default": null,
+            "name": "lienAllowed",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "preClosurePenalInterest",
+            "default": null,
+            "name": "minBalanceForInterestCalculation",
             "type": [
                 "null",
                 "bigdecimal"
             ]
         },
         {
-            "name": "preClosurePenalInterestOnType",
+            "default": null,
+            "name": "onHoldFunds",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
-            ]
-        },
-        {
-            "name": "minDepositTerm",
-            "type": [
-                "null",
-                "int"
+                "bigdecimal"
             ]
         },
         {
-            "name": "maxDepositTerm",
+            "default": null,
+            "name": "withHoldTax",
             "type": [
                 "null",
-                "int"
+                "boolean"
             ]
         },
         {
-            "name": "minDepositTermType",
+            "default": null,
+            "name": "lastActiveTransactionDate",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
+                "string"
             ]
         },
         {
-            "name": "maxDepositTermType",
+            "default": null,
+            "name": "isDormancyTrackingActive",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
+                "boolean"
             ]
         },
         {
-            "name": "inMultiplesOfDepositTerm",
+            "default": null,
+            "name": "daysToInactive",
             "type": [
                 "null",
                 "int"
             ]
         },
         {
-            "name": "inMultiplesOfDepositTermType",
-            "type": [
-                "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
-            ]
-        },
-        {
-            "name": "depositAmount",
-            "type": [
-                "null",
-                "float"
-            ]
-        },
-        {
-            "name": "maturityAmount",
-            "type": [
-                "null",
-                "float"
-            ]
-        },
-        {
-            "name": "maturityDate",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "depositPeriod",
+            "default": null,
+            "name": "daysToDormancy",
             "type": [
                 "null",
                 "int"
             ]
         },
         {
-            "name": "depositPeriodFrequency",
-            "type": [
-                "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
-            ]
-        },
-        {
-            "name": "mandatoryRecommendedDepositAmount",
+            "default": null,
+            "name": "daysToEscheat",
             "type": [
                 "null",
-                "bigdecimal"
+                "int"
             ]
         },
         {
-            "name": "totalOverdueAmount",
+            "default": null,
+            "name": "savingsAmountOnHold",
             "type": [
                 "null",
                 "bigdecimal"
             ]
         },
         {
-            "name": "noOfOverdueInstallments",
-            "type": [
-                "null",
-                "int"
-            ]
-        },
-        {
-            "name": "isMandatoryDeposit",
+            "default": null,
+            "name": "summary",
             "type": [
                 "null",
-                "boolean"
+                "org.apache.fineract.avro.savings.v1.SavingsAccountSummaryDataV1"
             ]
         },
         {
-            "name": "allowWithdrawal",
+            "name": "transactions",
             "type": [
                 "null",
-                "boolean"
+                {
+                    "type": "array",
+                    "items": "org.apache.fineract.avro.savings.v1.SavingsAccountTransactionDataV1"
+                }
             ]
         },
         {
-            "name": "adjustAdvanceTowardsFuturePayments",
+            "name": "charges",
             "type": [
                 "null",
-                "boolean"
+                {
+                    "type": "array",
+                    "items": "org.apache.fineract.avro.savings.v1.SavingsAccountChargeDataV1"
+                }
             ]
         },
         {
-            "name": "expectedFirstDepositOnDate",
+            "default": null,
+            "name": "withdrawalFee",
             "type": [
                 "null",
-                "string"
+                "org.apache.fineract.avro.savings.v1.SavingsAccountChargeDataV1"
             ]
         },
         {
-            "name": "isCalendarInherited",
+            "default": null,
+            "name": "annualFee",
             "type": [
                 "null",
-                "boolean"
+                "org.apache.fineract.avro.savings.v1.SavingsAccountChargeDataV1"
             ]
         },
         {
-            "name": "recurringFrequency",
+            "default": null,
+            "name": "nominalAnnualInterestRateOverdraft",
             "type": [
                 "null",
-                "int"
+                "bigdecimal"
             ]
         },
         {
-            "name": "recurringFrequencyType",
+            "default": null,
+            "name": "minOverdraftForInterestCalculation",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
+                "bigdecimal"
             ]
         }
     ]
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountStatusEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountStatusEnumDataV1.avsc
index 666a00c53..7ee9c2242 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountStatusEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountStatusEnumDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "value",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedAndPendingApproval",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approved",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejected",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawnByApplicant",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "active",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closed",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "prematureClosed",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferInProgress",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transferOnHold",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "matured",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSubStatusEnumDataV1.avsc
similarity index 64%
copy from fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSubStatusEnumDataV1.avsc
index 052e6b9dc..5ec702017 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSubStatusEnumDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "LoanStatusEnumDataV1",
-    "namespace": "org.apache.fineract.avro.loan.v1",
+    "name": "SavingsAccountSubStatusEnumDataV1",
+    "namespace": "org.apache.fineract.avro.savings.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,63 +20,64 @@
             ]
         },
         {
-            "name": "description",
+            "default": null,
+            "name": "value",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "pendingApproval",
+            "default": null,
+            "name": "none",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "waitingForDisbursal",
+            "default": null,
+            "name": "inactive",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "active",
+            "default": null,
+            "name": "dormant",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "closedObligationsMet",
+            "default": null,
+            "name": "escheat",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "closedWrittenOff",
+            "default": null,
+            "name": "block",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "closedRescheduled",
+            "default": null,
+            "name": "blockCredit",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "closed",
-            "type": [
-                "null",
-                "boolean"
-            ]
-        },
-        {
-            "name": "overpaid",
+            "default": null,
+            "name": "blockDebit",
             "type": [
                 "null",
                 "boolean"
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSummaryDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSummaryDataV1.avsc
index 1a495f580..4516ece42 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSummaryDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountSummaryDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalDeposits",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWithdrawals",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWithdrawalFees",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalAnnualFees",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalInterestEarned",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalInterestPosted",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountBalance",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalFeeCharge",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalPenaltyCharge",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalOverdraftInterestDerived",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalWithholdTax",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestNotPosted",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lastInterestCalculationDate",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "availableBalance",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPostedTillDate",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "prevInterestPostedTillDate",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionDataV1.avsc
index 6c4c673c4..7385ddc89 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transactionType",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountId",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "date",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "paymentDetailData",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amount",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "outstandingChargeAmount",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "runningBalance",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "reversed",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "transfer",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestedPostedAsOn",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByUsername",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "note",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isManualTransaction",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "isReversal",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "originalTransactionId",
             "type": [
                 "null",
@@ -137,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lienTransaction",
             "type": [
                 "null",
@@ -144,6 +164,7 @@
             ]
         },
         {
+            "default": null,
             "name": "releaseTransactionId",
             "type": [
                 "null",
@@ -151,6 +172,7 @@
             ]
         },
         {
+            "default": null,
             "name": "reasonForBlock",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionEnumDataV1.avsc
index a34f173cb..3886839f9 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountTransactionEnumDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "value",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "deposit",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "dividendPayout",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawal",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "interestPosting",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "feeDeduction",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "initiateTransfer",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approveTransfer",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withdrawTransfer",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectTransfer",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overdraftInterest",
             "type": [
                 "null",
@@ -95,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "writtenoff",
             "type": [
                 "null",
@@ -102,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "overdraftFee",
             "type": [
                 "null",
@@ -109,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "withholdTax",
             "type": [
                 "null",
@@ -116,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "escheat",
             "type": [
                 "null",
@@ -123,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountHold",
             "type": [
                 "null",
@@ -130,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "amountRelease",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountApplicationTimelineDataV1.avsc
similarity index 80%
copy from fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/share/v1/ShareAccountApplicationTimelineDataV1.avsc
index 8cf070280..99d3d099e 100644
--- a/fineract-avro-schemas/src/main/avro/savings/v1/SavingsAccountApplicationTimelineDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountApplicationTimelineDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "SavingsAccountApplicationTimelineDataV1",
-    "namespace": "org.apache.fineract.avro.savings.v1",
+    "name": "ShareAccountApplicationTimelineDataV1",
+    "namespace": "org.apache.fineract.avro.share.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "submittedOnDate",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByUsername",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByFirstname",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "submittedByLastname",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedOnDate",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByUsername",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByFirstname",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "rejectedByLastname",
             "type": [
                 "null",
@@ -60,34 +68,7 @@
             ]
         },
         {
-            "name": "withdrawnOnDate",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "withdrawnByUsername",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "withdrawnByFirstname",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "withdrawnByLastname",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
+            "default": null,
             "name": "approvedOnDate",
             "type": [
                 "null",
@@ -95,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByUsername",
             "type": [
                 "null",
@@ -102,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByFirstname",
             "type": [
                 "null",
@@ -109,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "approvedByLastname",
             "type": [
                 "null",
@@ -116,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedOnDate",
             "type": [
                 "null",
@@ -123,6 +108,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByUsername",
             "type": [
                 "null",
@@ -130,6 +116,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByFirstname",
             "type": [
                 "null",
@@ -137,6 +124,7 @@
             ]
         },
         {
+            "default": null,
             "name": "activatedByLastname",
             "type": [
                 "null",
@@ -144,6 +132,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedOnDate",
             "type": [
                 "null",
@@ -151,6 +140,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByUsername",
             "type": [
                 "null",
@@ -158,6 +148,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByFirstname",
             "type": [
                 "null",
@@ -165,6 +156,7 @@
             ]
         },
         {
+            "default": null,
             "name": "closedByLastname",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountDataV1.avsc
similarity index 64%
copy from fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/share/v1/ShareAccountDataV1.avsc
index e31976afa..9dcb79362 100644
--- a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "ShareProductDataV1",
+    "name": "ShareAccountDataV1",
     "namespace": "org.apache.fineract.avro.share.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,117 +12,128 @@
             ]
         },
         {
-            "name": "name",
+            "default": null,
+            "name": "accountNo",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "shortName",
+            "default": null,
+            "name": "externalId",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "description",
+            "default": null,
+            "name": "savingsAccountNumber",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "externalId",
+            "default": null,
+            "name": "clientId",
             "type": [
                 "null",
-                "string"
+                "long"
             ]
         },
         {
-            "name": "currency",
+            "default": null,
+            "name": "clientName",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.CurrencyDataV1"
+                "string"
             ]
         },
         {
-            "name": "totalShares",
+            "default": null,
+            "name": "defaultShares",
             "type": [
                 "null",
                 "long"
             ]
         },
         {
-            "name": "totalSharesIssued",
+            "default": null,
+            "name": "productId",
             "type": [
                 "null",
                 "long"
             ]
         },
         {
-            "name": "unitPrice",
+            "default": null,
+            "name": "productName",
             "type": [
                 "null",
-                "bigdecimal"
+                "string"
             ]
         },
         {
-            "name": "shareCapital",
+            "default": null,
+            "name": "status",
             "type": [
                 "null",
-                "bigdecimal"
+                "org.apache.fineract.avro.share.v1.ShareAccountStatusEnumDataV1"
             ]
         },
         {
-            "name": "minimumShares",
+            "default": null,
+            "name": "timeline",
             "type": [
                 "null",
-                "long"
+                "org.apache.fineract.avro.share.v1.ShareAccountApplicationTimelineDataV1"
             ]
         },
         {
-            "name": "nominalShares",
+            "default": null,
+            "name": "currency",
             "type": [
                 "null",
-                "long"
+                "org.apache.fineract.avro.generic.v1.CurrencyDataV1"
             ]
         },
         {
-            "name": "maximumShares",
+            "default": null,
+            "name": "summary",
             "type": [
                 "null",
-                "long"
+                "org.apache.fineract.avro.share.v1.ShareAccountSummaryDataV1"
             ]
         },
         {
-            "name": "marketPrice",
+            "name": "purchasedShares",
             "type": [
                 "null",
                 {
                     "type": "array",
-                    "items": "org.apache.fineract.avro.share.v1.ShareProductMarketPriceDataV1"
+                    "items": "org.apache.fineract.avro.share.v1.ShareAccountTransactionDataV1"
                 }
             ]
         },
         {
-            "name": "charges",
+            "name": "savingsAccountId",
             "type": [
                 "null",
-                {
-                    "type": "array",
-                    "items": "org.apache.fineract.avro.portfolio.v1.ChargeDataV1"
-                }
+                "long"
             ]
         },
         {
-            "name": "allowDividendCalculationForInactiveClients",
+            "default": null,
+            "name": "currentMarketPrice",
             "type": [
                 "null",
-                "boolean"
+                "bigdecimal"
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriod",
             "type": [
                 "null",
@@ -129,6 +141,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockPeriodTypeEnum",
             "type": [
                 "null",
@@ -136,6 +149,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumActivePeriod",
             "type": [
                 "null",
@@ -143,11 +157,20 @@
             ]
         },
         {
-            "name": "minimumActivePeriodForDividendsTypeEnum",
+            "default": null,
+            "name": "minimumActivePeriodTypeEnum",
             "type": [
                 "null",
                 "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
             ]
+        },
+        {
+            "default": null,
+            "name": "allowDividendCalculationForInactiveClients",
+            "type": [
+                "null",
+                "boolean"
+            ]
         }
     ]
 }
diff --git a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountStatusEnumDataV1.avsc
similarity index 58%
copy from fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/share/v1/ShareAccountStatusEnumDataV1.avsc
index 052e6b9dc..55174173d 100644
--- a/fineract-avro-schemas/src/main/avro/loan/v1/LoanStatusEnumDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountStatusEnumDataV1.avsc
@@ -1,16 +1,18 @@
 {
-    "name": "LoanStatusEnumDataV1",
-    "namespace": "org.apache.fineract.avro.loan.v1",
+    "name": "ShareAccountStatusEnumDataV1",
+    "namespace": "org.apache.fineract.avro.share.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
-                "int"
+                "long"
             ]
         },
         {
+            "default": null,
             "name": "code",
             "type": [
                 "null",
@@ -18,67 +20,52 @@
             ]
         },
         {
-            "name": "description",
+            "default": null,
+            "name": "value",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "pendingApproval",
+            "default": null,
+            "name": "submittedAndPendingApproval",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "waitingForDisbursal",
+            "default": null,
+            "name": "approved",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "active",
-            "type": [
-                "null",
-                "boolean"
-            ]
-        },
-        {
-            "name": "closedObligationsMet",
-            "type": [
-                "null",
-                "boolean"
-            ]
-        },
-        {
-            "name": "closedWrittenOff",
+            "default": null,
+            "name": "rejected",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
-            "name": "closedRescheduled",
+            "default": null,
+            "name": "active",
             "type": [
                 "null",
                 "boolean"
             ]
         },
         {
+            "default": null,
             "name": "closed",
             "type": [
                 "null",
                 "boolean"
             ]
-        },
-        {
-            "name": "overpaid",
-            "type": [
-                "null",
-                "boolean"
-            ]
         }
     ]
 }
diff --git a/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountSummaryDataV1.avsc
similarity index 64%
copy from fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/share/v1/ShareAccountSummaryDataV1.avsc
index d93348d1f..36f1e2b0d 100644
--- a/fineract-avro-schemas/src/main/avro/portfolio/v1/PortfolioAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountSummaryDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "PortfolioAccountDataV1",
-    "namespace": "org.apache.fineract.avro.portfolio.v1",
+    "name": "ShareAccountSummaryDataV1",
+    "namespace": "org.apache.fineract.avro.share.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "accountNo",
             "type": [
                 "null",
@@ -18,41 +20,31 @@
             ]
         },
         {
-            "name": "externalId",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "groupId",
+            "default": null,
+            "name": "totalApprovedShares",
             "type": [
                 "null",
                 "long"
             ]
         },
         {
-            "name": "groupName",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "clientId",
+            "default": null,
+            "name": "totalPendingForApprovalShares",
             "type": [
                 "null",
                 "long"
             ]
         },
         {
-            "name": "clientName",
+            "default": null,
+            "name": "externalId",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
+            "default": null,
             "name": "productId",
             "type": [
                 "null",
@@ -60,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "productName",
             "type": [
                 "null",
@@ -67,20 +60,23 @@
             ]
         },
         {
-            "name": "fieldOfficerId",
+            "default": null,
+            "name": "shortProductName",
             "type": [
                 "null",
-                "long"
+                "string"
             ]
         },
         {
-            "name": "fieldOfficerName",
+            "default": null,
+            "name": "status",
             "type": [
                 "null",
-                "string"
+                "org.apache.fineract.avro.share.v1.ShareAccountStatusEnumDataV1"
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -88,10 +84,11 @@
             ]
         },
         {
-            "name": "amtForTransfer",
+            "default": null,
+            "name": "timeline",
             "type": [
                 "null",
-                "bigdecimal"
+                "org.apache.fineract.avro.share.v1.ShareAccountApplicationTimelineDataV1"
             ]
         }
     ]
diff --git a/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountTransactionDataV1.avsc
similarity index 59%
copy from fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc
copy to fineract-avro-schemas/src/main/avro/share/v1/ShareAccountTransactionDataV1.avsc
index 737ebf257..c82de702d 100644
--- a/fineract-avro-schemas/src/main/avro/gl/v1/GLAccountDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareAccountTransactionDataV1.avsc
@@ -1,9 +1,10 @@
 {
-    "name": "GLAccountDataV1",
-    "namespace": "org.apache.fineract.avro.gl.v1",
+    "name": "ShareAccountTransactionDataV1",
+    "namespace": "org.apache.fineract.avro.share.v1",
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,80 +12,75 @@
             ]
         },
         {
-            "name": "name",
-            "type": [
-                "null",
-                "string"
-            ]
-        },
-        {
-            "name": "parentId",
+            "default": null,
+            "name": "accountId",
             "type": [
                 "null",
                 "long"
             ]
         },
         {
-            "name": "glCode",
+            "default": null,
+            "name": "purchasedDate",
             "type": [
                 "null",
                 "string"
             ]
         },
         {
-            "name": "disabled",
+            "default": null,
+            "name": "numberOfShares",
             "type": [
                 "null",
-                "boolean"
+                "long"
             ]
         },
         {
-            "name": "manualEntriesAllowed",
+            "default": null,
+            "name": "purchasedPrice",
             "type": [
                 "null",
-                "boolean"
+                "bigdecimal"
             ]
         },
         {
-            "name": "type",
+            "default": null,
+            "name": "status",
             "type": [
                 "null",
                 "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
             ]
         },
         {
-            "name": "usage",
+            "default": null,
+            "name": "type",
             "type": [
                 "null",
                 "org.apache.fineract.avro.generic.v1.EnumOptionDataV1"
             ]
         },
         {
-            "name": "description",
+            "default": null,
+            "name": "amount",
             "type": [
                 "null",
-                "string"
-            ]
-        },
-        {
-            "name": "nameDecorated",
-            "type": [
-                "null",
-                "string"
+                "bigdecimal"
             ]
         },
         {
-            "name": "tagId",
+            "default": null,
+            "name": "chargeAmount",
             "type": [
                 "null",
-                "org.apache.fineract.avro.generic.v1.CodeValueDataV1"
+                "bigdecimal"
             ]
         },
         {
-            "name": "organizationRunningBalance",
+            "default": null,
+            "name": "amountPaid",
             "type": [
                 "null",
-                "long"
+                "bigdecimal"
             ]
         }
     ]
diff --git a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc
index e31976afa..1aa53bc27 100644
--- a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareProductDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "name",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "shortName",
             "type": [
                 "null",
@@ -25,6 +28,7 @@
             ]
         },
         {
+            "default": null,
             "name": "description",
             "type": [
                 "null",
@@ -32,6 +36,7 @@
             ]
         },
         {
+            "default": null,
             "name": "externalId",
             "type": [
                 "null",
@@ -39,6 +44,7 @@
             ]
         },
         {
+            "default": null,
             "name": "currency",
             "type": [
                 "null",
@@ -46,6 +52,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalShares",
             "type": [
                 "null",
@@ -53,6 +60,7 @@
             ]
         },
         {
+            "default": null,
             "name": "totalSharesIssued",
             "type": [
                 "null",
@@ -60,6 +68,7 @@
             ]
         },
         {
+            "default": null,
             "name": "unitPrice",
             "type": [
                 "null",
@@ -67,6 +76,7 @@
             ]
         },
         {
+            "default": null,
             "name": "shareCapital",
             "type": [
                 "null",
@@ -74,6 +84,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumShares",
             "type": [
                 "null",
@@ -81,6 +92,7 @@
             ]
         },
         {
+            "default": null,
             "name": "nominalShares",
             "type": [
                 "null",
@@ -88,6 +100,7 @@
             ]
         },
         {
+            "default": null,
             "name": "maximumShares",
             "type": [
                 "null",
@@ -115,6 +128,7 @@
             ]
         },
         {
+            "default": null,
             "name": "allowDividendCalculationForInactiveClients",
             "type": [
                 "null",
@@ -122,6 +136,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockinPeriod",
             "type": [
                 "null",
@@ -129,6 +144,7 @@
             ]
         },
         {
+            "default": null,
             "name": "lockPeriodTypeEnum",
             "type": [
                 "null",
@@ -136,6 +152,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumActivePeriod",
             "type": [
                 "null",
@@ -143,6 +160,7 @@
             ]
         },
         {
+            "default": null,
             "name": "minimumActivePeriodForDividendsTypeEnum",
             "type": [
                 "null",
diff --git a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductMarketPriceDataV1.avsc b/fineract-avro-schemas/src/main/avro/share/v1/ShareProductMarketPriceDataV1.avsc
index 2d6766302..380ae5a2a 100644
--- a/fineract-avro-schemas/src/main/avro/share/v1/ShareProductMarketPriceDataV1.avsc
+++ b/fineract-avro-schemas/src/main/avro/share/v1/ShareProductMarketPriceDataV1.avsc
@@ -4,6 +4,7 @@
     "type": "record",
     "fields": [
         {
+            "default": null,
             "name": "id",
             "type": [
                 "null",
@@ -11,6 +12,7 @@
             ]
         },
         {
+            "default": null,
             "name": "fromDate",
             "type": [
                 "null",
@@ -18,6 +20,7 @@
             ]
         },
         {
+            "default": null,
             "name": "shareValue",
             "type": [
                 "null",