fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vorbur...@apache.org
Subject [fineract] branch develop updated: FINERACT-897
Date Sun, 17 May 2020 00:14:00 GMT
This is an automated email from the ASF dual-hosted git repository.

vorburger 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 4360260  FINERACT-897
     new ddaffd1  Merge pull request #857 from xurror/FINERACT-897
4360260 is described below

commit 4360260ac6ff24fa2f0e993d1a6f14ecb05cc23a
Author: xurror <kaze.nasser@outlook.com>
AuthorDate: Sat May 9 16:37:29 2020 +0100

    FINERACT-897
    
    make fineract compatible with both mysql5.5 and  mysql v8
---
 .../mifospltaform-tenants-first-time-install.sql   |   58 +-
 .../0001-mifos-platform-shared-tenants.sql         |   18 +-
 .../bare-bones-demo/bk_bare_bones_demo.sql         |  732 +++---
 .../bk_mifostenant_default.sql                     |  732 +++---
 .../ceda/bk_ceda_trial.sql                         |  728 +++---
 .../ceda/bk_core_with_custom_and_coa.sql           |  728 +++---
 .../ceda/ceda-schema-customisations.sql            |   58 +-
 .../default-demo/bk_mifostenant-default.sql        |  732 +++---
 .../extra-datatables-and-code-values.sql           |   26 +-
 .../gk-maarg/0001b-gk-datatables.sql               |    4 +-
 .../latam-demo/bk_latam.sql                        |  740 +++---
 .../latam-demo/datatables-on-latam-demo.sql        |   26 +-
 .../0001a-mifosplatform-core-ddl-latest.sql        |  548 ++---
 .../0004-mifosx-core-reports-utf8.sql              |    4 +-
 .../core/service/TenantDatabaseUpgradeService.java |    2 +-
 .../service/ReadWriteNonCoreDataServiceImpl.java   |   12 +-
 ..._add_mulitplesof_to_account_transfers_table.sql |    2 +-
 .../core_db/V102__client_attendance_tables.sql     |   14 +-
 .../V103__cluster_support_for_batch_jobs.sql       |   12 +-
 ...V105__track_loan_transaction_against_office.sql |    4 +-
 .../core_db/V107__datatable_code_mappings.sql      |    4 +-
 .../core_db/V108__client_has_transfer_office.sql   |    2 +-
 .../V10__interest-posting-fields-for-savings.sql   |    4 +-
 .../core_db/V110__group_center_close.sql           |    2 +-
 .../core_db/V112__mixreport_sql_support.sql        |   22 +-
 ...3__track_savings_transaction_against_office.sql |    4 +-
 .../core_db/V115__permissions_for_cache_api.sql    |    6 +-
 .../core_db/V117__loan_charge_from_savings.sql     |    6 +-
 ...18_7__move_withdrawal_annual_fee_to_charges.sql |   28 +-
 .../migrations/core_db/V118__savings_charge.sql    |   32 +-
 .../core_db/V119__add_template_table.sql           |   28 +-
 .../core_db/V11__add-payment-details.sql           |    8 +-
 .../V122__recurring_fee_support_for_savings.sql    |    8 +-
 .../V123__remove_payment_mode_for_savings.sql      |    2 +-
 ...initial_database_structure_for_sms_outbound.sql |   12 +-
 .../V128__added_loan_installment_charge.sql        |   12 +-
 .../core_db/V129__client_and_group_timeline.sql    |   12 +-
 .../V12__add_external_id_to_couple_of_tables.sql   |    4 +-
 .../core_db/V130__calendar-history-table.sql       |   16 +-
 ...V131__holiday-status-column-and-permissions.sql |    2 +-
 .../core_db/V132__borrower_cycle_changes.sql       |   14 +-
 ...3__adding_payment_detail_with_journal_entry.sql |    4 +-
 .../V136_1__update_script_strechy_parameter.sql    |    2 +-
 .../V137__added_is_active_column_in_m_staff.sql    |    2 +-
 ...ue_for_is_active_updated_to_true_in_m_staff.sql |    2 +-
 ...ed_payment_detail_id_in_ac_gl_journal_entry.sql |    2 +-
 .../core_db/V140__added_loan_charge_status.sql     |    2 +-
 .../core_db/V144__spelling_mistake_corrections.sql |    2 +-
 ...add_force_password_reset_in_c_configuration.sql |    4 +-
 .../sql/migrations/core_db/V146__tranche_loans.sql |   18 +-
 .../V147__tranche_loans_column_name_changes.sql    |    4 +-
 .../migrations/core_db/V148__overdraft_changes.sql |    6 +-
 .../core_db/V14__rename_status_id_to_enum.sql      |    4 +-
 .../core_db/V150__basic_savings_report.sql         |    2 +-
 ...V151__add_default_savings_account_to_client.sql |    2 +-
 .../core_db/V152__added_grace_for_over_due.sql     |    4 +-
 .../core_db/V157__overdue_charge_improvements.sql  |   12 +-
 .../core_db/V160__standing_instruction_changes.sql |   78 +-
 .../core_db/V163__added_npa_for_loans.sql          |    4 +-
 .../core_db/V164__fd_and_rd_deposit_tables.sql     |  136 +-
 ...er_fixed_deposit_interest_to_linked_account.sql |    2 +-
 ...171__added_mandatory_savings_and_rd_changes.sql |   18 +-
 .../V172__accounting_changes_for_transfers.sql     |   10 +-
 .../resources/sql/migrations/core_db/V173__ppi.sql |   22 +-
 .../V175__added_incentive_interest_rates.sql       |   28 +-
 ...176__updates_to_financial_activity_accounts.sql |    2 +-
 .../core_db/V17__update_stretchy_reporting_ddl.sql |   22 +-
 .../core_db/V181__standing_instruction_logging.sql |    4 +-
 ...ded_min_required_balance_to_savings_product.sql |    4 +-
 ...te_min_required_balance_for_savings_product.sql |    4 +-
 .../V189__m_loan_interest_recalculation_tables.sql |   24 +-
 ...nterestComponent_for_interest_recalculation.sql |    2 +-
 ...V195__moved_rest_frequency_to_product_level.sql |    8 +-
 ...pdated_loan_running_balance_of_transactions.sql |    4 +-
 ...8__loan_rescheduling_tables_and_permissions.sql |   38 +-
 ...removed_extra_columns_from_schedule_history.sql |    2 +-
 .../core_db/V1__mifosplatform-core-ddl-latest.sql  |  548 ++---
 .../sql/migrations/core_db/V201__webhooks.sql      |   36 +-
 .../V202__savings_officer_history_table.sql        |   12 +-
 ...or_charge_and_interest_waiver_with_accruals.sql |    2 +-
 .../core_db/V207__min_max_clients_per_group.sql    |    4 +-
 .../V210__track_manually_adjusted_transactions.sql |    2 +-
 ..._days_between_disbursal_and_first_repayment.sql |    2 +-
 ...V212__add_NthDay_and_DayOfWeek_columns_loan.sql |    4 +-
 ...ay_and_DayOfWeek_columns_should_be_nullable.sql |    4 +-
 ...__alter_table_add_create_SI_at_disbursement.sql |    2 +-
 .../V215__guarantee_on_hold_fund_changes.sql       |    8 +-
 ..._client_substatus_and_codevalue_description.sql |    2 +-
 ..._and_datetime_for_loan_savings_transactions.sql |    4 +-
 ..._guarantor_on_hold_fund_changes_for_account.sql |   30 +-
 .../V21__activation-permissions-for-clients.sql    |    2 +-
 .../core_db/V220__account_number_preferences.sql   |    8 +-
 .../V221__add_version_for_m_savings_account.sql    |    2 +-
 ...antor_on_hold_fund_changes_for_transactions.sql |    2 +-
 .../V223__add_version_for_m_loan_account.sql       |    2 +-
 .../V224__client_lifecycle_adding_statuses.sql     |   12 +-
 .../core_db/V228__entity_to_entity_access.sql      |    8 +-
 .../core_db/V229__teller_cash_management.sql       |   24 +-
 ...alter-group-for-consistency-add-permissions.sql |    4 +-
 ...0__role_status_and_correspoding_permissions.sql |    2 +-
 .../core_db/V235__add_ugd_template_id_m_hook.sql   |    2 +-
 ...ars_aging_config_for_interest_recalculation.sql |    4 +-
 .../migrations/core_db/V241__fixed_emi_changes.sql |    2 +-
 .../V242__entitytoentitymappingrelation.sql        |   18 +-
 .../V244__staff_assignment_history_table.sql       |   10 +-
 .../core_db/V250__password_validation_policy.sql   |    6 +-
 .../migrations/core_db/V251__paymentType_table.sql |   10 +-
 .../V253__product_loan_configurable_attributes.sql |    4 +-
 .../V255__pre_close_interest_period_config.sql     |    2 +-
 .../core_db/V257__staff_image_association.sql      |    2 +-
 .../core_db/V258__interest_compounding_changes.sql |    8 +-
 .../core_db/V259__alter_working_days.sql           |    2 +-
 ...nt_reports_for_status_and_activation_change.sql |    2 +-
 .../V265__modify_external_service_schema.sql       |    8 +-
 .../sql/migrations/core_db/V266__client_fees.sql   |   44 +-
 ..._add-support-for-withdrawal-fees-on-savings.sql |    4 +-
 .../V271__accounting_for_client_charges.sql        |    4 +-
 .../V272__loan_tranche_disbursement_charge.sql     |   14 +-
 .../sql/migrations/core_db/V273__oauth_changes.sql |   10 +-
 ...n_transaction_to_repayment_schedule_mapping.sql |    6 +-
 .../core_db/V277__Loan_Product_Provisioning.sql    |   54 +-
 .../V278__LoanTransactionProcessingStrategy.sql    |    2 +-
 .../migrations/core_db/V279__floating_rates.sql    |   24 +-
 .../V27__add-loan-type-column-to-loan-table.sql    |    2 +-
 .../core_db/V280__spm_framework_initial_tables.sql |   46 +-
 .../core_db/V282__CustomerSelfService.sql          |    8 +-
 .../core_db/V283__Variable_Installments.sql        |   10 +-
 .../migrations/core_db/V284__update_codevalue.sql  |    2 +-
 .../V286__partial_period_interest_calcualtion.sql  |    4 +-
 .../core_db/V287__alter_spm_scorecard.sql          |   14 +-
 .../migrations/core_db/V289__client_non_person.sql |   10 +-
 ...28__accounting-abstractions-and-autoposting.sql |   30 +-
 ...93__interest_rate_chart_support_for_amounts.sql |   10 +-
 .../core_db/V298__savings_interest_tax.sql         |   46 +-
 .../migrations/core_db/V299__share_products.sql    |  132 +-
 ...V29__add-support-for-annual-fees-on-savings.sql |    8 +-
 ...301__recurring_moratorium_principal_periods.sql |    4 +-
 .../V302__add_status_to_client_identifier.sql      |    4 +-
 .../core_db/V303__Savings_Account_Dormancy.sql     |   10 +-
 ...customer_self_service_third_party_transfers.sql |    4 +-
 ...y_freq_and_insertion_script_for_accrual_job.sql |   12 +-
 .../migrations/core_db/V307__add_share_notes.sql   |    2 +-
 .../V309__add_loan_write_off_reason_code.sql       |    2 +-
 .../core_db/V311__foreclosure_details.sql          |    2 +-
 .../V312__add_is_mandatory_to_code_value.sql       |    2 +-
 .../core_db/V313__multi_rescheduling_script.sql    |   14 +-
 .../V316__address_module_tables_metadat.sql        |   26 +-
 .../core_db/V317__report_mailing_job_module.sql    |   10 +-
 .../sql/migrations/core_db/V318__topuploan.sql     |    6 +-
 .../core_db/V322_1__scheduled_email_campaign.sql   |   32 +-
 .../sql/migrations/core_db/V322__sms_campaign.sql  |   22 +-
 ...323__spm_replace_dead_fk_with_exisiting_one.sql |   14 +-
 .../migrations/core_db/V324__datatable_checks.sql  |   13 +-
 .../core_db/V325__add_is_staff_client_data.sql     |    2 +-
 .../core_db/V327__creditbureau_configuration.sql   |   38 +-
 .../core_db/V328__family_members_sql_support.sql   |   18 +-
 .../V329__sms_messages_without_campaign.sql        |    2 +-
 ...V330__savings_account_transaction_releaseId.sql |    2 +-
 .../core_db/V331__holiday_schema_changes.sql       |    2 +-
 .../V332__self_service_registration_schema.sql     |    6 +-
 .../sql/migrations/core_db/V333__adhocquery.sql    |    6 +-
 .../core_db/V334__notification_module_tables.sql   |   16 +-
 .../core_db/V336__sms_campaign_notification.sql    |   10 +-
 .../core_db/V337__equal_amortization.sql           |    4 +-
 .../core_db/V338__two_factor_authentication.sql    |    6 +-
 .../migrations/core_db/V341__m_import_document.sql |   16 +-
 .../core_db/V342__topic_module_table.sql           |   12 +-
 ...d_paging_recalculate_interest_for_loans_job.sql |    6 +-
 .../V345__reports_for_self_service_user.sql        |    2 +-
 .../core_db/V348__m_trial_balance_table.sql        |    4 +-
 .../core_db/V349__client_transfer_details.sql      |   12 +-
 .../migrations/core_db/V351__pocket_mapping.sql    |   12 +-
 .../sql/migrations/core_db/V352__interop_init.sql  |    8 +-
 .../sql/migrations/core_db/V355__rates.sql         |   20 +-
 .../core_db/V356__GSIM_migration_script.sql        |   14 +-
 .../core_db/V357__GLIM_migration_script.sql        |   12 +-
 .../V36__add_tag_id_column_for_acc_gl_account.sql  |    2 +-
 .../core_db/V39__payment-channels-updates.sql      |    4 +-
 ...efault_value_for_id_for_acc_accounting_rule.sql |    2 +-
 .../core_db/V43__accounting-for-savings.sql        |    4 +-
 .../core_db/V45__create_acc_rule_tags_table.sql    |    8 +-
 .../core_db/V47__staff-hierarchy-link-to-users.sql |    4 +-
 .../migrations/core_db/V48__adding-S3-Support.sql  |   14 +-
 ...V49__track-loan-charge-payment-transactions.sql |    8 +-
 .../core_db/V4__mifosx-core-reports-utf8.sql       |    4 +-
 .../V50__add-grace-settings-to-loan-product.sql    |   12 +-
 ...boolean_support_cols_to_acc_accounting_rule.sql |    4 +-
 .../V54__charge-to-income-account-mappings.sql     |    2 +-
 ...bit_and_credit_accounts_acc_accounting_rule.sql |    4 +-
 .../core_db/V58__create-holiday-tables_changed.sql |    6 +-
 ...V59__add_group_roles_schema_and_permissions.sql |   10 +-
 ...__update-savings-product-and-account-tables.sql |    4 +-
 .../V62__add_staff_id_to_m_client_changed.sql      |    2 +-
 ...nc_disbursement_with_meeting_column_to_loan.sql |    2 +-
 .../core_db/V66__client_close_functionality.sql    |    2 +-
 .../core_db/V67__loans_in_advance_table.sql        |    4 +-
 .../core_db/V72__add_m_loan_counter_changes.sql    |   14 +-
 ...cheduled_to_and_processed_column_to_holiday.sql |    2 +-
 .../core_db/V79__schedule_jobs_tables.sql          |   16 +-
 .../core_db/V81__savings_related_changes.sql       |   22 +-
 ...dule_jobs_tables_updates_for_running_status.sql |    2 +-
 .../core_db/V83__non-working-days-table.sql        |    6 +-
 .../core_db/V85__product_mix_related_changes.sql   |    8 +-
 ...__added_update_constrain_for_scheduler_jobs.sql |    2 +-
 .../core_db/V89__added_scheduler_group.sql         |    2 +-
 .../core_db/V94__added_savings_accont type.sql     |    2 +-
 .../V96__savings_accounts_transfers_table.sql      |   32 +-
 .../V98__added_currency_roundof_for_multipleof.sql |   12 +-
 ...n_max_constraint_column_to_loan_loanproduct.sql |   16 +-
 .../list_db/V1__mifos-platform-shared-tenants.sql  |   18 +-
 .../V2__externalize-connection-properties.sql      |   26 +-
 .../list_db/V3__deadlock-retry-properties.sql      |    4 +-
 ...columns_and_tenants_server_connection_table.sql |   46 +-
 .../sql/migrations/sample_data/barebones_db.sql    | 2426 ++++++++++----------
 .../migrations/sample_data/interop_sample_data.sql |   12 +-
 .../migrations/sample_data/load_sample_data.sql    | 2416 +++++++++----------
 .../sample_data/tn03_interop_sample_data.sql       |    8 +-
 .../sample_data/tn04_interop_sample_data.sql       |    8 +-
 218 files changed, 6395 insertions(+), 6398 deletions(-)

diff --git a/fineract-db/mifospltaform-tenants-first-time-install.sql b/fineract-db/mifospltaform-tenants-first-time-install.sql
index 87ab311..c97c507 100644
--- a/fineract-db/mifospltaform-tenants-first-time-install.sql
+++ b/fineract-db/mifospltaform-tenants-first-time-install.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,24 +40,24 @@
 
 DROP TABLE IF EXISTS `schema_version`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `schema_version` (
-  `version_rank` int(11) NOT NULL,
-  `installed_rank` int(11) NOT NULL,
+  `version_rank` INT NOT NULL,
+  `installed_rank` INT NOT NULL,
   `version` varchar(50) NOT NULL,
   `description` varchar(200) NOT NULL,
   `type` varchar(20) NOT NULL,
   `script` varchar(1000) NOT NULL,
-  `checksum` int(11) DEFAULT NULL,
+  `checksum` INT DEFAULT NULL,
   `installed_by` varchar(100) NOT NULL,
   `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `execution_time` int(11) NOT NULL,
-  `success` tinyint(1) NOT NULL,
+  `execution_time` INT NOT NULL,
+  `success` tinyint NOT NULL,
   PRIMARY KEY (`version`),
   KEY `schema_version_vr_idx` (`version_rank`),
   KEY `schema_version_ir_idx` (`installed_rank`),
   KEY `schema_version_s_idx` (`success`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -77,14 +77,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `tenants`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `tenants` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `identifier` varchar(100) NOT NULL,
   `name` varchar(100) NOT NULL,
   `schema_name` varchar(100) NOT NULL,
   `timezone_id` varchar(100) NOT NULL,
-  `country_id` int(11) DEFAULT NULL,
+  `country_id` INT DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
@@ -92,22 +92,22 @@ CREATE TABLE `tenants` (
   `schema_server_port` varchar(10) NOT NULL DEFAULT '3306',
   `schema_username` varchar(100) NOT NULL DEFAULT 'root',
   `schema_password` varchar(100) NOT NULL DEFAULT 'mysql',
-  `auto_update` tinyint(1) NOT NULL DEFAULT '1',
-  `pool_initial_size` int(5) DEFAULT 5,
-  `pool_validation_interval` int(11) DEFAULT 30000,
-  `pool_remove_abandoned` tinyint(1) DEFAULT 1,
-  `pool_remove_abandoned_timeout` int(5) DEFAULT 60,
-  `pool_log_abandoned` tinyint(1) DEFAULT 1,
-  `pool_abandon_when_percentage_full` int(5) DEFAULT 50,
-  `pool_test_on_borrow` tinyint(1) DEFAULT 1,
-  `pool_max_active` int(5) DEFAULT 40,
-  `pool_min_idle` int(5) DEFAULT 20,
-  `pool_max_idle` int(5) DEFAULT 10,
-  `pool_suspect_timeout` int(5) DEFAULT 60,
-  `pool_time_between_eviction_runs_millis` int(11) DEFAULT 34000,
-  `pool_min_evictable_idle_time_millis` int(11) DEFAULT 60000,
+  `auto_update` tinyint NOT NULL DEFAULT '1',
+  `pool_initial_size` INT DEFAULT 5,
+  `pool_validation_interval` INT DEFAULT 30000,
+  `pool_remove_abandoned` tinyint DEFAULT 1,
+  `pool_remove_abandoned_timeout` INT DEFAULT 60,
+  `pool_log_abandoned` tinyint DEFAULT 1,
+  `pool_abandon_when_percentage_full` INT DEFAULT 50,
+  `pool_test_on_borrow` tinyint DEFAULT 1,
+  `pool_max_active` INT DEFAULT 40,
+  `pool_min_idle` INT DEFAULT 20,
+  `pool_max_idle` INT DEFAULT 10,
+  `pool_suspect_timeout` INT DEFAULT 60,
+  `pool_time_between_eviction_runs_millis` INT DEFAULT 34000,
+  `pool_min_evictable_idle_time_millis` INT DEFAULT 60000,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -127,14 +127,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `timezones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `timezones` (
-  `id` int(3) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `country_code` varchar(2) NOT NULL,
   `timezonename` varchar(100) NOT NULL,
   `comments` varchar(150) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/0001-mifos-platform-shared-tenants.sql b/fineract-db/multi-tenant-demo-backups/0001-mifos-platform-shared-tenants.sql
index e84a413..8160784 100644
--- a/fineract-db/multi-tenant-demo-backups/0001-mifos-platform-shared-tenants.sql
+++ b/fineract-db/multi-tenant-demo-backups/0001-mifos-platform-shared-tenants.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,14 +40,14 @@
 
 DROP TABLE IF EXISTS `tenants`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `tenants` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `identifier` varchar(100) NOT NULL,
   `name` varchar(100) NOT NULL,
   `schema_name` varchar(100) NOT NULL,
   `timezone_id` varchar(100) NOT NULL,
-  `country_id` int(11) DEFAULT NULL,
+  `country_id` INT DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
@@ -55,9 +55,9 @@ CREATE TABLE `tenants` (
   `schema_server_port` varchar(10) NOT NULL DEFAULT '3306',
   `schema_username` varchar(100) NOT NULL DEFAULT 'root',
   `schema_password` varchar(100) NOT NULL DEFAULT 'mysql',
-  `auto_update` tinyint(1) NOT NULL DEFAULT '1',
+  `auto_update` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -76,14 +76,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `timezones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `timezones` (
-  `id` int(3) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `country_code` varchar(2) NOT NULL,
   `timezonename` varchar(100) NOT NULL,
   `comments` varchar(150) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql b/fineract-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
index c3259af..4e810f6 100644
--- a/fineract-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
+++ b/fineract-db/multi-tenant-demo-backups/bare-bones-demo/bk_bare_bones_demo.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -73,14 +73,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -92,7 +92,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -110,23 +110,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_entry` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `manual_entry` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `entity_type_enum` smallint(5) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_type_enum` SMALLINT DEFAULT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -140,7 +140,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -158,15 +158,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -184,13 +184,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -209,49 +209,49 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `client additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -269,19 +269,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_client_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_client_details` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_extra_client_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -299,19 +299,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_family_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_family_details` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
   `Name` varchar(40) DEFAULT NULL,
   `Date of Birth` date DEFAULT NULL,
-  `Points Score` int(11) DEFAULT NULL,
-  `Education_cd_Highest` int(11) DEFAULT NULL,
+  `Points Score` INT DEFAULT NULL,
+  `Education_cd_Highest` INT DEFAULT NULL,
   `Other Notes` text,
   PRIMARY KEY (`id`),
   KEY `FK_Extra Family Details Data_1` (`client_id`),
   CONSTRAINT `FK_family_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -329,19 +329,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_loan_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_loan_details` (
-  `loan_id` bigint(20) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_extra_loan_details` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -359,19 +359,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `impact measurement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -389,20 +389,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `loan additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -420,11 +420,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -439,7 +439,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -458,16 +458,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -486,27 +486,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `title` varchar(50) NOT NULL,
   `description` varchar(100) DEFAULT NULL,
   `location` varchar(50) DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `duration` smallint(6) DEFAULT NULL,
-  `calendar_type_enum` smallint(5) NOT NULL,
-  `repeating` tinyint(1) NOT NULL DEFAULT '0',
+  `duration` SMALLINT DEFAULT NULL,
+  `calendar_type_enum` SMALLINT NOT NULL,
+  `repeating` tinyint NOT NULL DEFAULT '0',
   `recurrence` varchar(100) DEFAULT NULL,
-  `remind_by_enum` smallint(5) DEFAULT NULL,
-  `first_reminder` smallint(11) DEFAULT NULL,
-  `second_reminder` smallint(11) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `remind_by_enum` SMALLINT DEFAULT NULL,
+  `first_reminder` smallint DEFAULT NULL,
+  `second_reminder` smallint DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -524,16 +524,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar_instance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar_instance` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `calendar_id` bigint(20) NOT NULL,
-  `entity_id` bigint(20) NOT NULL,
-  `entity_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `calendar_id` BIGINT NOT NULL,
+  `entity_id` BIGINT NOT NULL,
+  `entity_type_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_calendar_m_calendar_instance` (`calendar_id`),
   CONSTRAINT `FK_m_calendar_m_calendar_instance` FOREIGN KEY (`calendar_id`) REFERENCES `m_calendar` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -551,21 +551,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -583,11 +583,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -596,13 +596,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -620,15 +620,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -638,7 +638,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -656,14 +656,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -682,17 +682,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -711,17 +711,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -740,19 +740,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -770,15 +770,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -796,17 +796,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
-  `staff_id` bigint(20) DEFAULT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
-  `level_Id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
+  `staff_id` BIGINT DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
+  `level_Id` INT NOT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`level_Id`),
   UNIQUE KEY `external_id` (`external_id`,`level_Id`),
@@ -818,7 +818,7 @@ CREATE TABLE `m_group` (
   CONSTRAINT `Parent_Id_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK_m_group_level` FOREIGN KEY (`level_Id`) REFERENCES `m_group_level` (`id`),
   CONSTRAINT `FK_m_group_m_staff` FOREIGN KEY (`staff_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -836,15 +836,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -862,18 +862,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_level` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent_id` int(11) DEFAULT NULL,
-  `super_parent` tinyint(1) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `parent_id` INT DEFAULT NULL,
+  `super_parent` tinyint NOT NULL,
   `level_name` varchar(100) NOT NULL,
-  `recursable` tinyint(1) NOT NULL,
-  `can_have_clients` tinyint(1) NOT NULL,
+  `recursable` tinyint NOT NULL,
+  `can_have_clients` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Parent_levelId_reference` (`parent_id`),
   CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -892,12 +892,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -913,7 +913,7 @@ CREATE TABLE `m_guarantor` (
   PRIMARY KEY (`id`),
   KEY `FK_m_guarantor_m_loan` (`loan_id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -931,46 +931,46 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `loanpurpose_cv_id` int(11) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `loanpurpose_cv_id` INT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `submittedon_date` date DEFAULT NULL,
-  `submittedon_userid` bigint(20) DEFAULT NULL,
+  `submittedon_userid` BIGINT DEFAULT NULL,
   `approvedon_date` date DEFAULT NULL,
-  `approvedon_userid` bigint(20) DEFAULT NULL,
+  `approvedon_userid` BIGINT DEFAULT NULL,
   `expected_disbursedon_date` date DEFAULT NULL,
   `expected_firstrepaymenton_date` date DEFAULT NULL,
   `interest_calculated_from_date` date DEFAULT NULL,
   `disbursedon_date` date DEFAULT NULL,
-  `disbursedon_userid` bigint(20) DEFAULT NULL,
+  `disbursedon_userid` BIGINT DEFAULT NULL,
   `expected_maturedon_date` date DEFAULT NULL,
   `maturedon_date` date DEFAULT NULL,
   `closedon_date` date DEFAULT NULL,
-  `closedon_userid` bigint(20) DEFAULT NULL,
+  `closedon_userid` BIGINT DEFAULT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `principal_disbursed_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `principal_repaid_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -999,12 +999,12 @@ CREATE TABLE `m_loan` (
   `total_writtenoff_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `total_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `rejectedon_date` date DEFAULT NULL,
-  `rejectedon_userid` bigint(20) DEFAULT NULL,
+  `rejectedon_userid` BIGINT DEFAULT NULL,
   `rescheduledon_date` date DEFAULT NULL,
   `withdrawnon_date` date DEFAULT NULL,
-  `withdrawnon_userid` bigint(20) DEFAULT NULL,
+  `withdrawnon_userid` BIGINT DEFAULT NULL,
   `writtenoffon_date` date DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -1034,7 +1034,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_submittedon_userid` FOREIGN KEY (`submittedon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_withdrawnon_userid` FOREIGN KEY (`withdrawnon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1052,9 +1052,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_arrears_aging`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_arrears_aging` (
-  `loan_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL AUTO_INCREMENT,
   `principal_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `interest_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `fee_charges_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -1063,7 +1063,7 @@ CREATE TABLE `m_loan_arrears_aging` (
   `overdue_since_date_derived` date DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `m_loan_arrears_aging_ibfk_1` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1081,15 +1081,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -1097,14 +1097,14 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
-  `waived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
+  `waived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1122,18 +1122,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_collateral`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_collateral` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_cv_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_cv_id` INT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_collateral_m_loan` (`loan_id`),
   KEY `FK_collateral_code_value` (`type_cv_id`),
   CONSTRAINT `FK_collateral_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FK_collateral_code_value` FOREIGN KEY (`type_cv_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1151,23 +1151,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1185,13 +1185,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -1207,15 +1207,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1233,12 +1233,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `is_reversed` tinyint NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1248,7 +1248,7 @@ CREATE TABLE `m_loan_transaction` (
   PRIMARY KEY (`id`),
   KEY `FKCFCEA42640BE0710` (`loan_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1266,19 +1266,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1292,7 +1292,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_note_m_group` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1310,10 +1310,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1323,7 +1323,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1342,13 +1342,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1357,7 +1357,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1375,16 +1375,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1403,17 +1403,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=287 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=287 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1432,24 +1432,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
-  `subresource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
+  `subresource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1464,7 +1464,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1482,34 +1482,34 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1527,15 +1527,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1553,14 +1553,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1579,16 +1579,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1607,24 +1607,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `status_enum` smallint(5) NOT NULL DEFAULT '300',
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `status_enum` SMALLINT NOT NULL DEFAULT '300',
   `activation_date` date DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   `lockedin_until_date_derived` date DEFAULT NULL,
   `total_deposits_derived` decimal(19,6) DEFAULT NULL,
   `total_withdrawals_derived` decimal(19,6) DEFAULT NULL,
@@ -1639,7 +1639,7 @@ CREATE TABLE `m_savings_account` (
   CONSTRAINT `FKSA00000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKSA00000000000002` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FKSA00000000000003` FOREIGN KEY (`product_id`) REFERENCES `m_savings_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1657,18 +1657,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `savings_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `savings_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
+  `is_reversed` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FKSAT0000000001` (`savings_account_id`),
   CONSTRAINT `FKSAT0000000001` FOREIGN KEY (`savings_account_id`) REFERENCES `m_savings_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1686,21 +1686,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_product`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_product` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `sp_unq_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1718,11 +1718,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_staff`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_staff` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_loan_officer` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_loan_officer` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `display_name` varchar(100) NOT NULL,
@@ -1730,7 +1730,7 @@ CREATE TABLE `m_staff` (
   UNIQUE KEY `display_name` (`display_name`),
   KEY `FK_m_staff_m_office` (`office_id`),
   CONSTRAINT `FK_m_staff_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1748,16 +1748,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `r_enum_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `r_enum_value` (
   `enum_name` varchar(100) NOT NULL,
-  `enum_id` int(11) NOT NULL,
+  `enum_id` INT NOT NULL,
   `enum_message_property` varchar(100) NOT NULL,
   `enum_value` varchar(100) NOT NULL,
   PRIMARY KEY (`enum_name`,`enum_id`),
   UNIQUE KEY `enum_message_property` (`enum_name`,`enum_message_property`),
   UNIQUE KEY `enum_value` (`enum_name`,`enum_value`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1776,18 +1776,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `ref_loan_transaction_processing_strategy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `ref_loan_transaction_processing_strategy` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(100) DEFAULT NULL,
   `name` varchar(255) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ltp_strategy_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1806,11 +1806,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `rpt_sequence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `rpt_sequence` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1828,9 +1828,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_parameter` (
-  `parameter_id` int(11) NOT NULL AUTO_INCREMENT,
+  `parameter_id` INT NOT NULL AUTO_INCREMENT,
   `parameter_name` varchar(45) NOT NULL,
   `parameter_variable` varchar(45) DEFAULT NULL,
   `parameter_label` varchar(45) NOT NULL,
@@ -1841,12 +1841,12 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
-  `parent_parameter_id` int(11) DEFAULT NULL,
+  `parent_parameter_id` INT DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
   UNIQUE KEY `name_UNIQUE` (`parameter_name`),
   KEY `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
   CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1855,7 +1855,7 @@ CREATE TABLE `stretchy_parameter` (
 
 LOCK TABLES `stretchy_parameter` WRITE;
 /*!40000 ALTER TABLE `stretchy_parameter` DISABLE KEYS */;
-INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
+INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
 /*!40000 ALTER TABLE `stretchy_parameter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1865,20 +1865,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report` (
-  `report_id` int(11) NOT NULL AUTO_INCREMENT,
+  `report_id` INT NOT NULL AUTO_INCREMENT,
   `report_name` varchar(100) NOT NULL,
   `report_type` varchar(20) NOT NULL,
   `report_subtype` varchar(20) DEFAULT NULL,
   `report_category` varchar(45) DEFAULT NULL,
   `report_sql` text,
   `description` text,
-  `core_report` tinyint(1) DEFAULT '0',
-  `use_report` tinyint(1) DEFAULT '0',
+  `core_report` tinyint DEFAULT '0',
+  `use_report` tinyint DEFAULT '0',
   PRIMARY KEY (`report_id`),
   UNIQUE KEY `report_name_UNIQUE` (`report_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1887,7 +1887,7 @@ CREATE TABLE `stretchy_report` (
 
 LOCK TABLES `stretchy_report` WRITE;
 /*!40000 ALTER TABLE `stretchy_report` DISABLE KEYS */;
-INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
+INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
 /*!40000 ALTER TABLE `stretchy_report` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1897,14 +1897,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report_parameter` (
-  `report_id` int(11) NOT NULL,
-  `parameter_id` int(11) NOT NULL,
+  `report_id` INT NOT NULL,
+  `parameter_id` INT NOT NULL,
   `report_parameter_name` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`report_id`,`parameter_id`),
   UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1923,12 +1923,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `x_registered_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `x_registered_table` (
   `registered_table_name` varchar(50) NOT NULL,
   `application_table_name` varchar(50) NOT NULL,
   PRIMARY KEY (`registered_table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/bk_mifostenant_default.sql b/fineract-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
index c1f13f2..61da348 100644
--- a/fineract-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
+++ b/fineract-db/multi-tenant-demo-backups/bk_mifostenant_default.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -74,14 +74,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -111,23 +111,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_entry` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `manual_entry` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `entity_type_enum` smallint(5) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_type_enum` SMALLINT DEFAULT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -141,7 +141,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -159,15 +159,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -185,13 +185,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -210,49 +210,49 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `client additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -270,19 +270,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_client_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_client_details` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_extra_client_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -300,19 +300,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_family_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_family_details` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
   `Name` varchar(40) DEFAULT NULL,
   `Date of Birth` date DEFAULT NULL,
-  `Points Score` int(11) DEFAULT NULL,
-  `Education_cd_Highest` int(11) DEFAULT NULL,
+  `Points Score` INT DEFAULT NULL,
+  `Education_cd_Highest` INT DEFAULT NULL,
   `Other Notes` text,
   PRIMARY KEY (`id`),
   KEY `FK_Extra Family Details Data_1` (`client_id`),
   CONSTRAINT `FK_family_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -330,19 +330,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_loan_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_loan_details` (
-  `loan_id` bigint(20) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_extra_loan_details` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -360,19 +360,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `impact measurement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -390,20 +390,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `loan additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -421,11 +421,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -440,7 +440,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -459,16 +459,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -487,27 +487,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `title` varchar(50) NOT NULL,
   `description` varchar(100) DEFAULT NULL,
   `location` varchar(50) DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `duration` smallint(6) DEFAULT NULL,
-  `calendar_type_enum` smallint(5) NOT NULL,
-  `repeating` tinyint(1) NOT NULL DEFAULT '0',
+  `duration` SMALLINT DEFAULT NULL,
+  `calendar_type_enum` SMALLINT NOT NULL,
+  `repeating` tinyint NOT NULL DEFAULT '0',
   `recurrence` varchar(100) DEFAULT NULL,
-  `remind_by_enum` smallint(5) DEFAULT NULL,
-  `first_reminder` smallint(11) DEFAULT NULL,
-  `second_reminder` smallint(11) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `remind_by_enum` SMALLINT DEFAULT NULL,
+  `first_reminder` smallint DEFAULT NULL,
+  `second_reminder` smallint DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -525,16 +525,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar_instance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar_instance` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `calendar_id` bigint(20) NOT NULL,
-  `entity_id` bigint(20) NOT NULL,
-  `entity_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `calendar_id` BIGINT NOT NULL,
+  `entity_id` BIGINT NOT NULL,
+  `entity_type_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_calendar_m_calendar_instance` (`calendar_id`),
   CONSTRAINT `FK_m_calendar_m_calendar_instance` FOREIGN KEY (`calendar_id`) REFERENCES `m_calendar` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -552,21 +552,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -584,11 +584,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -597,13 +597,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -621,15 +621,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -639,7 +639,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -657,14 +657,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -683,17 +683,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -712,17 +712,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -741,19 +741,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -771,15 +771,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -797,17 +797,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
-  `staff_id` bigint(20) DEFAULT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
-  `level_Id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
+  `staff_id` BIGINT DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
+  `level_Id` INT NOT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`level_Id`),
   UNIQUE KEY `external_id` (`external_id`,`level_Id`),
@@ -819,7 +819,7 @@ CREATE TABLE `m_group` (
   CONSTRAINT `Parent_Id_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK_m_group_level` FOREIGN KEY (`level_Id`) REFERENCES `m_group_level` (`id`),
   CONSTRAINT `FK_m_group_m_staff` FOREIGN KEY (`staff_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -837,15 +837,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -863,18 +863,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_level` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent_id` int(11) DEFAULT NULL,
-  `super_parent` tinyint(1) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `parent_id` INT DEFAULT NULL,
+  `super_parent` tinyint NOT NULL,
   `level_name` varchar(100) NOT NULL,
-  `recursable` tinyint(1) NOT NULL,
-  `can_have_clients` tinyint(1) NOT NULL,
+  `recursable` tinyint NOT NULL,
+  `can_have_clients` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Parent_levelId_reference` (`parent_id`),
   CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -893,12 +893,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -914,7 +914,7 @@ CREATE TABLE `m_guarantor` (
   PRIMARY KEY (`id`),
   KEY `FK_m_guarantor_m_loan` (`loan_id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -932,46 +932,46 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `loanpurpose_cv_id` int(11) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `loanpurpose_cv_id` INT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `submittedon_date` date DEFAULT NULL,
-  `submittedon_userid` bigint(20) DEFAULT NULL,
+  `submittedon_userid` BIGINT DEFAULT NULL,
   `approvedon_date` date DEFAULT NULL,
-  `approvedon_userid` bigint(20) DEFAULT NULL,
+  `approvedon_userid` BIGINT DEFAULT NULL,
   `expected_disbursedon_date` date DEFAULT NULL,
   `expected_firstrepaymenton_date` date DEFAULT NULL,
   `interest_calculated_from_date` date DEFAULT NULL,
   `disbursedon_date` date DEFAULT NULL,
-  `disbursedon_userid` bigint(20) DEFAULT NULL,
+  `disbursedon_userid` BIGINT DEFAULT NULL,
   `expected_maturedon_date` date DEFAULT NULL,
   `maturedon_date` date DEFAULT NULL,
   `closedon_date` date DEFAULT NULL,
-  `closedon_userid` bigint(20) DEFAULT NULL,
+  `closedon_userid` BIGINT DEFAULT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `principal_disbursed_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `principal_repaid_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -1000,12 +1000,12 @@ CREATE TABLE `m_loan` (
   `total_writtenoff_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `total_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `rejectedon_date` date DEFAULT NULL,
-  `rejectedon_userid` bigint(20) DEFAULT NULL,
+  `rejectedon_userid` BIGINT DEFAULT NULL,
   `rescheduledon_date` date DEFAULT NULL,
   `withdrawnon_date` date DEFAULT NULL,
-  `withdrawnon_userid` bigint(20) DEFAULT NULL,
+  `withdrawnon_userid` BIGINT DEFAULT NULL,
   `writtenoffon_date` date DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -1035,7 +1035,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_submittedon_userid` FOREIGN KEY (`submittedon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_withdrawnon_userid` FOREIGN KEY (`withdrawnon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1053,9 +1053,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_arrears_aging`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_arrears_aging` (
-  `loan_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL AUTO_INCREMENT,
   `principal_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `interest_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `fee_charges_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -1064,7 +1064,7 @@ CREATE TABLE `m_loan_arrears_aging` (
   `overdue_since_date_derived` date DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `m_loan_arrears_aging_ibfk_1` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1082,15 +1082,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -1098,14 +1098,14 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
-  `waived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
+  `waived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1123,18 +1123,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_collateral`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_collateral` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_cv_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_cv_id` INT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_collateral_m_loan` (`loan_id`),
   KEY `FK_collateral_code_value` (`type_cv_id`),
   CONSTRAINT `FK_collateral_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FK_collateral_code_value` FOREIGN KEY (`type_cv_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1152,23 +1152,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1186,13 +1186,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -1208,15 +1208,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1234,12 +1234,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `is_reversed` tinyint NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1249,7 +1249,7 @@ CREATE TABLE `m_loan_transaction` (
   PRIMARY KEY (`id`),
   KEY `FKCFCEA42640BE0710` (`loan_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,19 +1267,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1293,7 +1293,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_note_m_group` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1311,10 +1311,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1324,7 +1324,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1343,13 +1343,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1358,7 +1358,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1376,16 +1376,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1404,17 +1404,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=299 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=299 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1433,24 +1433,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
-  `subresource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
+  `subresource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1465,7 +1465,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1483,34 +1483,34 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1528,15 +1528,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1554,14 +1554,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1580,16 +1580,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1608,24 +1608,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `status_enum` smallint(5) NOT NULL DEFAULT '300',
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `status_enum` SMALLINT NOT NULL DEFAULT '300',
   `activation_date` date DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   `lockedin_until_date_derived` date DEFAULT NULL,
   `total_deposits_derived` decimal(19,6) DEFAULT NULL,
   `total_withdrawals_derived` decimal(19,6) DEFAULT NULL,
@@ -1640,7 +1640,7 @@ CREATE TABLE `m_savings_account` (
   CONSTRAINT `FKSA00000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKSA00000000000002` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FKSA00000000000003` FOREIGN KEY (`product_id`) REFERENCES `m_savings_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1658,18 +1658,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `savings_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `savings_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
+  `is_reversed` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FKSAT0000000001` (`savings_account_id`),
   CONSTRAINT `FKSAT0000000001` FOREIGN KEY (`savings_account_id`) REFERENCES `m_savings_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1687,21 +1687,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_product`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_product` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `sp_unq_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1719,11 +1719,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_staff`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_staff` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_loan_officer` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_loan_officer` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `display_name` varchar(100) NOT NULL,
@@ -1731,7 +1731,7 @@ CREATE TABLE `m_staff` (
   UNIQUE KEY `display_name` (`display_name`),
   KEY `FK_m_staff_m_office` (`office_id`),
   CONSTRAINT `FK_m_staff_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1749,16 +1749,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `r_enum_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `r_enum_value` (
   `enum_name` varchar(100) NOT NULL,
-  `enum_id` int(11) NOT NULL,
+  `enum_id` INT NOT NULL,
   `enum_message_property` varchar(100) NOT NULL,
   `enum_value` varchar(100) NOT NULL,
   PRIMARY KEY (`enum_name`,`enum_id`),
   UNIQUE KEY `enum_message_property` (`enum_name`,`enum_message_property`),
   UNIQUE KEY `enum_value` (`enum_name`,`enum_value`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1777,18 +1777,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `ref_loan_transaction_processing_strategy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `ref_loan_transaction_processing_strategy` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(100) DEFAULT NULL,
   `name` varchar(255) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ltp_strategy_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1807,11 +1807,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `rpt_sequence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `rpt_sequence` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1829,9 +1829,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_parameter` (
-  `parameter_id` int(11) NOT NULL AUTO_INCREMENT,
+  `parameter_id` INT NOT NULL AUTO_INCREMENT,
   `parameter_name` varchar(45) NOT NULL,
   `parameter_variable` varchar(45) DEFAULT NULL,
   `parameter_label` varchar(45) NOT NULL,
@@ -1842,12 +1842,12 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
-  `parent_parameter_id` int(11) DEFAULT NULL,
+  `parent_parameter_id` INT DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
   UNIQUE KEY `name_UNIQUE` (`parameter_name`),
   KEY `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
   CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1856,7 +1856,7 @@ CREATE TABLE `stretchy_parameter` (
 
 LOCK TABLES `stretchy_parameter` WRITE;
 /*!40000 ALTER TABLE `stretchy_parameter` DISABLE KEYS */;
-INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
+INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
 /*!40000 ALTER TABLE `stretchy_parameter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1866,20 +1866,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report` (
-  `report_id` int(11) NOT NULL AUTO_INCREMENT,
+  `report_id` INT NOT NULL AUTO_INCREMENT,
   `report_name` varchar(100) NOT NULL,
   `report_type` varchar(20) NOT NULL,
   `report_subtype` varchar(20) DEFAULT NULL,
   `report_category` varchar(45) DEFAULT NULL,
   `report_sql` text,
   `description` text,
-  `core_report` tinyint(1) DEFAULT '0',
-  `use_report` tinyint(1) DEFAULT '0',
+  `core_report` tinyint DEFAULT '0',
+  `use_report` tinyint DEFAULT '0',
   PRIMARY KEY (`report_id`),
   UNIQUE KEY `report_name_UNIQUE` (`report_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1888,7 +1888,7 @@ CREATE TABLE `stretchy_report` (
 
 LOCK TABLES `stretchy_report` WRITE;
 /*!40000 ALTER TABLE `stretchy_report` DISABLE KEYS */;
-INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
+INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
 /*!40000 ALTER TABLE `stretchy_report` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1898,14 +1898,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report_parameter` (
-  `report_id` int(11) NOT NULL,
-  `parameter_id` int(11) NOT NULL,
+  `report_id` INT NOT NULL,
+  `parameter_id` INT NOT NULL,
   `report_parameter_name` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`report_id`,`parameter_id`),
   UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1924,12 +1924,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `x_registered_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `x_registered_table` (
   `registered_table_name` varchar(50) NOT NULL,
   `application_table_name` varchar(50) NOT NULL,
   PRIMARY KEY (`registered_table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/ceda/bk_ceda_trial.sql b/fineract-db/multi-tenant-demo-backups/ceda/bk_ceda_trial.sql
index 609ff41..766a636 100644
--- a/fineract-db/multi-tenant-demo-backups/ceda/bk_ceda_trial.sql
+++ b/fineract-db/multi-tenant-demo-backups/ceda/bk_ceda_trial.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -74,14 +74,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -111,23 +111,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_entry` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `manual_entry` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `entity_type_enum` smallint(5) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_type_enum` SMALLINT DEFAULT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -141,7 +141,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -159,15 +159,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -186,13 +186,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -211,49 +211,49 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `client additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -271,19 +271,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `impact measurement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -301,20 +301,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `loan additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -332,11 +332,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -351,7 +351,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -370,16 +370,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -398,27 +398,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `title` varchar(50) NOT NULL,
   `description` varchar(100) DEFAULT NULL,
   `location` varchar(50) DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `duration` smallint(6) DEFAULT NULL,
-  `calendar_type_enum` smallint(5) NOT NULL,
-  `repeating` tinyint(1) NOT NULL DEFAULT '0',
+  `duration` SMALLINT DEFAULT NULL,
+  `calendar_type_enum` SMALLINT NOT NULL,
+  `repeating` tinyint NOT NULL DEFAULT '0',
   `recurrence` varchar(100) DEFAULT NULL,
-  `remind_by_enum` smallint(5) DEFAULT NULL,
-  `first_reminder` smallint(11) DEFAULT NULL,
-  `second_reminder` smallint(11) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `remind_by_enum` SMALLINT DEFAULT NULL,
+  `first_reminder` smallint DEFAULT NULL,
+  `second_reminder` smallint DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -436,16 +436,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar_instance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar_instance` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `calendar_id` bigint(20) NOT NULL,
-  `entity_id` bigint(20) NOT NULL,
-  `entity_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `calendar_id` BIGINT NOT NULL,
+  `entity_id` BIGINT NOT NULL,
+  `entity_type_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_calendar_m_calendar_instance` (`calendar_id`),
   CONSTRAINT `FK_m_calendar_m_calendar_instance` FOREIGN KEY (`calendar_id`) REFERENCES `m_calendar` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -463,21 +463,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -496,11 +496,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -509,13 +509,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -534,15 +534,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -552,7 +552,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -570,14 +570,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -596,17 +596,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -625,17 +625,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -654,19 +654,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -684,15 +684,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -710,17 +710,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
-  `staff_id` bigint(20) DEFAULT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
-  `level_Id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
+  `staff_id` BIGINT DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
+  `level_Id` INT NOT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`level_Id`),
   UNIQUE KEY `external_id` (`external_id`,`level_Id`),
@@ -732,7 +732,7 @@ CREATE TABLE `m_group` (
   CONSTRAINT `Parent_Id_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK_m_group_level` FOREIGN KEY (`level_Id`) REFERENCES `m_group_level` (`id`),
   CONSTRAINT `FK_m_group_m_staff` FOREIGN KEY (`staff_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -750,15 +750,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -776,18 +776,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_level` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent_id` int(11) DEFAULT NULL,
-  `super_parent` tinyint(1) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `parent_id` INT DEFAULT NULL,
+  `super_parent` tinyint NOT NULL,
   `level_name` varchar(100) NOT NULL,
-  `recursable` tinyint(1) NOT NULL,
-  `can_have_clients` tinyint(1) NOT NULL,
+  `recursable` tinyint NOT NULL,
+  `can_have_clients` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Parent_levelId_reference` (`parent_id`),
   CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -806,13 +806,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `client_reln_cv_id` int(11) DEFAULT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `client_reln_cv_id` INT DEFAULT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -830,7 +830,7 @@ CREATE TABLE `m_guarantor` (
   KEY `FK_m_guarantor_m_code_value` (`client_reln_cv_id`),
   CONSTRAINT `FK_m_guarantor_m_code_value` FOREIGN KEY (`client_reln_cv_id`) REFERENCES `m_code_value` (`id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -848,48 +848,48 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `loanpurpose_cv_id` int(11) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `loanpurpose_cv_id` INT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `min_principal_amount` decimal(19,6) NOT NULL,
   `max_principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `submittedon_date` date DEFAULT NULL,
-  `submittedon_userid` bigint(20) DEFAULT NULL,
+  `submittedon_userid` BIGINT DEFAULT NULL,
   `approvedon_date` date DEFAULT NULL,
-  `approvedon_userid` bigint(20) DEFAULT NULL,
+  `approvedon_userid` BIGINT DEFAULT NULL,
   `expected_disbursedon_date` date DEFAULT NULL,
   `expected_firstrepaymenton_date` date DEFAULT NULL,
   `interest_calculated_from_date` date DEFAULT NULL,
   `disbursedon_date` date DEFAULT NULL,
-  `disbursedon_userid` bigint(20) DEFAULT NULL,
+  `disbursedon_userid` BIGINT DEFAULT NULL,
   `expected_maturedon_date` date DEFAULT NULL,
   `maturedon_date` date DEFAULT NULL,
   `closedon_date` date DEFAULT NULL,
-  `closedon_userid` bigint(20) DEFAULT NULL,
+  `closedon_userid` BIGINT DEFAULT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `principal_disbursed_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `principal_repaid_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -918,12 +918,12 @@ CREATE TABLE `m_loan` (
   `total_writtenoff_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `total_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `rejectedon_date` date DEFAULT NULL,
-  `rejectedon_userid` bigint(20) DEFAULT NULL,
+  `rejectedon_userid` BIGINT DEFAULT NULL,
   `rescheduledon_date` date DEFAULT NULL,
   `withdrawnon_date` date DEFAULT NULL,
-  `withdrawnon_userid` bigint(20) DEFAULT NULL,
+  `withdrawnon_userid` BIGINT DEFAULT NULL,
   `writtenoffon_date` date DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -953,7 +953,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_submittedon_userid` FOREIGN KEY (`submittedon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_withdrawnon_userid` FOREIGN KEY (`withdrawnon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -972,9 +972,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_arrears_aging`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_arrears_aging` (
-  `loan_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL AUTO_INCREMENT,
   `principal_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `interest_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `fee_charges_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -983,7 +983,7 @@ CREATE TABLE `m_loan_arrears_aging` (
   `overdue_since_date_derived` date DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `m_loan_arrears_aging_ibfk_1` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1001,15 +1001,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -1017,14 +1017,14 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
-  `waived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
+  `waived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1043,11 +1043,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_collateral`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_collateral` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_cv_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_cv_id` INT NOT NULL,
   `value` decimal(19,6) DEFAULT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -1055,7 +1055,7 @@ CREATE TABLE `m_loan_collateral` (
   KEY `FK_collateral_code_value` (`type_cv_id`),
   CONSTRAINT `FK_collateral_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FK_collateral_code_value` FOREIGN KEY (`type_cv_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1074,23 +1074,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1109,13 +1109,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -1131,15 +1131,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1158,12 +1158,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `is_reversed` tinyint NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1173,7 +1173,7 @@ CREATE TABLE `m_loan_transaction` (
   PRIMARY KEY (`id`),
   KEY `FKCFCEA42640BE0710` (`loan_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1191,19 +1191,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1217,7 +1217,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_note_m_group` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1235,10 +1235,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1248,7 +1248,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,13 +1267,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1282,7 +1282,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1300,16 +1300,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1328,17 +1328,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1357,25 +1357,25 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `savings_account_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `savings_account_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
-  `subresource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
+  `subresource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1390,7 +1390,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1409,36 +1409,36 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `min_principal_amount` decimal(19,6) NOT NULL,
   `max_principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1457,15 +1457,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1483,14 +1483,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1509,16 +1509,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1537,25 +1537,25 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `status_enum` smallint(5) NOT NULL DEFAULT '300',
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `status_enum` SMALLINT NOT NULL DEFAULT '300',
   `activation_date` date DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_annual_interest_rate` decimal(19,6) NOT NULL,
-  `interest_compounding_period_enum` smallint(5) NOT NULL,
-  `interest_calculation_type_enum` smallint(5) NOT NULL,
-  `interest_calculation_days_in_year_type_enum` smallint(5) NOT NULL,
+  `interest_compounding_period_enum` SMALLINT NOT NULL,
+  `interest_calculation_type_enum` SMALLINT NOT NULL,
+  `interest_calculation_days_in_year_type_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   `lockedin_until_date_derived` date DEFAULT NULL,
   `total_deposits_derived` decimal(19,6) DEFAULT NULL,
   `total_withdrawals_derived` decimal(19,6) DEFAULT NULL,
@@ -1571,7 +1571,7 @@ CREATE TABLE `m_savings_account` (
   CONSTRAINT `FKSA00000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKSA00000000000002` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FKSA00000000000003` FOREIGN KEY (`product_id`) REFERENCES `m_savings_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1589,22 +1589,22 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `savings_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `savings_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
+  `is_reversed` tinyint NOT NULL,
   `running_balance_derived` decimal(19,6) DEFAULT NULL,
-  `balance_number_of_days_derived` int(11) DEFAULT NULL,
+  `balance_number_of_days_derived` INT DEFAULT NULL,
   `balance_end_date_derived` date DEFAULT NULL,
   `cumulative_balance_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FKSAT0000000001` (`savings_account_id`),
   CONSTRAINT `FKSAT0000000001` FOREIGN KEY (`savings_account_id`) REFERENCES `m_savings_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1622,23 +1622,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_product`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_product` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_annual_interest_rate` decimal(19,6) NOT NULL,
-  `interest_compounding_period_enum` smallint(5) NOT NULL,
-  `interest_calculation_type_enum` smallint(5) NOT NULL,
-  `interest_calculation_days_in_year_type_enum` smallint(5) NOT NULL,
+  `interest_compounding_period_enum` SMALLINT NOT NULL,
+  `interest_calculation_type_enum` SMALLINT NOT NULL,
+  `interest_calculation_days_in_year_type_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `sp_unq_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1656,11 +1656,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_staff`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_staff` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_loan_officer` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_loan_officer` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `display_name` varchar(100) NOT NULL,
@@ -1668,7 +1668,7 @@ CREATE TABLE `m_staff` (
   UNIQUE KEY `display_name` (`display_name`),
   KEY `FK_m_staff_m_office` (`office_id`),
   CONSTRAINT `FK_m_staff_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1687,16 +1687,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `r_enum_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `r_enum_value` (
   `enum_name` varchar(100) NOT NULL,
-  `enum_id` int(11) NOT NULL,
+  `enum_id` INT NOT NULL,
   `enum_message_property` varchar(100) NOT NULL,
   `enum_value` varchar(100) NOT NULL,
   PRIMARY KEY (`enum_name`,`enum_id`),
   UNIQUE KEY `enum_message_property` (`enum_name`,`enum_message_property`),
   UNIQUE KEY `enum_value` (`enum_name`,`enum_value`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1715,18 +1715,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `ref_loan_transaction_processing_strategy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `ref_loan_transaction_processing_strategy` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(100) DEFAULT NULL,
   `name` varchar(255) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ltp_strategy_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1745,11 +1745,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `rpt_sequence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `rpt_sequence` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1767,24 +1767,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `schema_version`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `schema_version` (
-  `version_rank` int(11) NOT NULL,
-  `installed_rank` int(11) NOT NULL,
+  `version_rank` INT NOT NULL,
+  `installed_rank` INT NOT NULL,
   `version` varchar(50) NOT NULL,
   `description` varchar(200) NOT NULL,
   `type` varchar(20) NOT NULL,
   `script` varchar(1000) NOT NULL,
-  `checksum` int(11) DEFAULT NULL,
+  `checksum` INT DEFAULT NULL,
   `installed_by` varchar(100) NOT NULL,
   `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `execution_time` int(11) NOT NULL,
-  `success` tinyint(1) NOT NULL,
+  `execution_time` INT NOT NULL,
+  `success` tinyint NOT NULL,
   PRIMARY KEY (`version`),
   KEY `schema_version_vr_idx` (`version_rank`),
   KEY `schema_version_ir_idx` (`installed_rank`),
   KEY `schema_version_s_idx` (`success`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1803,9 +1803,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_parameter` (
-  `parameter_id` int(11) NOT NULL AUTO_INCREMENT,
+  `parameter_id` INT NOT NULL AUTO_INCREMENT,
   `parameter_name` varchar(45) NOT NULL,
   `parameter_variable` varchar(45) DEFAULT NULL,
   `parameter_label` varchar(45) NOT NULL,
@@ -1816,12 +1816,12 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
-  `parent_parameter_id` int(11) DEFAULT NULL,
+  `parent_parameter_id` INT DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
   UNIQUE KEY `name_UNIQUE` (`parameter_name`),
   KEY `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
   CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1830,7 +1830,7 @@ CREATE TABLE `stretchy_parameter` (
 
 LOCK TABLES `stretchy_parameter` WRITE;
 /*!40000 ALTER TABLE `stretchy_parameter` DISABLE KEYS */;
-INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
+INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
 /*!40000 ALTER TABLE `stretchy_parameter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1840,20 +1840,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report` (
-  `report_id` int(11) NOT NULL AUTO_INCREMENT,
+  `report_id` INT NOT NULL AUTO_INCREMENT,
   `report_name` varchar(100) NOT NULL,
   `report_type` varchar(20) NOT NULL,
   `report_subtype` varchar(20) DEFAULT NULL,
   `report_category` varchar(45) DEFAULT NULL,
   `report_sql` text,
   `description` text,
-  `core_report` tinyint(1) DEFAULT '0',
-  `use_report` tinyint(1) DEFAULT '0',
+  `core_report` tinyint DEFAULT '0',
+  `use_report` tinyint DEFAULT '0',
   PRIMARY KEY (`report_id`),
   UNIQUE KEY `report_name_UNIQUE` (`report_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1862,7 +1862,7 @@ CREATE TABLE `stretchy_report` (
 
 LOCK TABLES `stretchy_report` WRITE;
 /*!40000 ALTER TABLE `stretchy_report` DISABLE KEYS */;
-INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
+INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
 /*!40000 ALTER TABLE `stretchy_report` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1872,14 +1872,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report_parameter` (
-  `report_id` int(11) NOT NULL,
-  `parameter_id` int(11) NOT NULL,
+  `report_id` INT NOT NULL,
+  `parameter_id` INT NOT NULL,
   `report_parameter_name` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`report_id`,`parameter_id`),
   UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1898,12 +1898,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `x_registered_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `x_registered_table` (
   `registered_table_name` varchar(50) NOT NULL,
   `application_table_name` varchar(50) NOT NULL,
   PRIMARY KEY (`registered_table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/ceda/bk_core_with_custom_and_coa.sql b/fineract-db/multi-tenant-demo-backups/ceda/bk_core_with_custom_and_coa.sql
index ea4f923..0628d76 100644
--- a/fineract-db/multi-tenant-demo-backups/ceda/bk_core_with_custom_and_coa.sql
+++ b/fineract-db/multi-tenant-demo-backups/ceda/bk_core_with_custom_and_coa.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -74,14 +74,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -111,23 +111,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_entry` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `manual_entry` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `entity_type_enum` smallint(5) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_type_enum` SMALLINT DEFAULT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -141,7 +141,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -159,15 +159,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -186,13 +186,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -211,49 +211,49 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `client additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -271,19 +271,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `impact measurement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -301,20 +301,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `loan additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -332,11 +332,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -351,7 +351,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -370,16 +370,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -398,27 +398,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `title` varchar(50) NOT NULL,
   `description` varchar(100) DEFAULT NULL,
   `location` varchar(50) DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `duration` smallint(6) DEFAULT NULL,
-  `calendar_type_enum` smallint(5) NOT NULL,
-  `repeating` tinyint(1) NOT NULL DEFAULT '0',
+  `duration` SMALLINT DEFAULT NULL,
+  `calendar_type_enum` SMALLINT NOT NULL,
+  `repeating` tinyint NOT NULL DEFAULT '0',
   `recurrence` varchar(100) DEFAULT NULL,
-  `remind_by_enum` smallint(5) DEFAULT NULL,
-  `first_reminder` smallint(11) DEFAULT NULL,
-  `second_reminder` smallint(11) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `remind_by_enum` SMALLINT DEFAULT NULL,
+  `first_reminder` smallint DEFAULT NULL,
+  `second_reminder` smallint DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -436,16 +436,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar_instance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar_instance` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `calendar_id` bigint(20) NOT NULL,
-  `entity_id` bigint(20) NOT NULL,
-  `entity_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `calendar_id` BIGINT NOT NULL,
+  `entity_id` BIGINT NOT NULL,
+  `entity_type_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_calendar_m_calendar_instance` (`calendar_id`),
   CONSTRAINT `FK_m_calendar_m_calendar_instance` FOREIGN KEY (`calendar_id`) REFERENCES `m_calendar` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -463,21 +463,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -496,11 +496,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -509,13 +509,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -534,15 +534,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -552,7 +552,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -570,14 +570,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -596,17 +596,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -625,17 +625,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -654,19 +654,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -684,15 +684,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -710,17 +710,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
-  `staff_id` bigint(20) DEFAULT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
-  `level_Id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
+  `staff_id` BIGINT DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
+  `level_Id` INT NOT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`level_Id`),
   UNIQUE KEY `external_id` (`external_id`,`level_Id`),
@@ -732,7 +732,7 @@ CREATE TABLE `m_group` (
   CONSTRAINT `Parent_Id_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK_m_group_level` FOREIGN KEY (`level_Id`) REFERENCES `m_group_level` (`id`),
   CONSTRAINT `FK_m_group_m_staff` FOREIGN KEY (`staff_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -750,15 +750,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -776,18 +776,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_level` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent_id` int(11) DEFAULT NULL,
-  `super_parent` tinyint(1) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `parent_id` INT DEFAULT NULL,
+  `super_parent` tinyint NOT NULL,
   `level_name` varchar(100) NOT NULL,
-  `recursable` tinyint(1) NOT NULL,
-  `can_have_clients` tinyint(1) NOT NULL,
+  `recursable` tinyint NOT NULL,
+  `can_have_clients` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Parent_levelId_reference` (`parent_id`),
   CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -806,13 +806,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `client_reln_cv_id` int(11) DEFAULT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `client_reln_cv_id` INT DEFAULT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -830,7 +830,7 @@ CREATE TABLE `m_guarantor` (
   KEY `FK_m_guarantor_m_code_value` (`client_reln_cv_id`),
   CONSTRAINT `FK_m_guarantor_m_code_value` FOREIGN KEY (`client_reln_cv_id`) REFERENCES `m_code_value` (`id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -848,48 +848,48 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `loanpurpose_cv_id` int(11) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `loanpurpose_cv_id` INT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `min_principal_amount` decimal(19,6) NOT NULL,
   `max_principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `submittedon_date` date DEFAULT NULL,
-  `submittedon_userid` bigint(20) DEFAULT NULL,
+  `submittedon_userid` BIGINT DEFAULT NULL,
   `approvedon_date` date DEFAULT NULL,
-  `approvedon_userid` bigint(20) DEFAULT NULL,
+  `approvedon_userid` BIGINT DEFAULT NULL,
   `expected_disbursedon_date` date DEFAULT NULL,
   `expected_firstrepaymenton_date` date DEFAULT NULL,
   `interest_calculated_from_date` date DEFAULT NULL,
   `disbursedon_date` date DEFAULT NULL,
-  `disbursedon_userid` bigint(20) DEFAULT NULL,
+  `disbursedon_userid` BIGINT DEFAULT NULL,
   `expected_maturedon_date` date DEFAULT NULL,
   `maturedon_date` date DEFAULT NULL,
   `closedon_date` date DEFAULT NULL,
-  `closedon_userid` bigint(20) DEFAULT NULL,
+  `closedon_userid` BIGINT DEFAULT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `principal_disbursed_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `principal_repaid_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -918,12 +918,12 @@ CREATE TABLE `m_loan` (
   `total_writtenoff_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `total_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `rejectedon_date` date DEFAULT NULL,
-  `rejectedon_userid` bigint(20) DEFAULT NULL,
+  `rejectedon_userid` BIGINT DEFAULT NULL,
   `rescheduledon_date` date DEFAULT NULL,
   `withdrawnon_date` date DEFAULT NULL,
-  `withdrawnon_userid` bigint(20) DEFAULT NULL,
+  `withdrawnon_userid` BIGINT DEFAULT NULL,
   `writtenoffon_date` date DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -953,7 +953,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_submittedon_userid` FOREIGN KEY (`submittedon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_withdrawnon_userid` FOREIGN KEY (`withdrawnon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -972,9 +972,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_arrears_aging`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_arrears_aging` (
-  `loan_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL AUTO_INCREMENT,
   `principal_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `interest_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `fee_charges_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -983,7 +983,7 @@ CREATE TABLE `m_loan_arrears_aging` (
   `overdue_since_date_derived` date DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `m_loan_arrears_aging_ibfk_1` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1001,15 +1001,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -1017,14 +1017,14 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
-  `waived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
+  `waived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1043,11 +1043,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_collateral`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_collateral` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_cv_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_cv_id` INT NOT NULL,
   `value` decimal(19,6) DEFAULT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -1055,7 +1055,7 @@ CREATE TABLE `m_loan_collateral` (
   KEY `FK_collateral_code_value` (`type_cv_id`),
   CONSTRAINT `FK_collateral_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FK_collateral_code_value` FOREIGN KEY (`type_cv_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1074,23 +1074,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1109,13 +1109,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -1131,15 +1131,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1158,12 +1158,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `is_reversed` tinyint NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1173,7 +1173,7 @@ CREATE TABLE `m_loan_transaction` (
   PRIMARY KEY (`id`),
   KEY `FKCFCEA42640BE0710` (`loan_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1191,19 +1191,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1217,7 +1217,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_note_m_group` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1235,10 +1235,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1248,7 +1248,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,13 +1267,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1282,7 +1282,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1300,16 +1300,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1328,17 +1328,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1357,25 +1357,25 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `savings_account_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `savings_account_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
-  `subresource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
+  `subresource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1390,7 +1390,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1409,36 +1409,36 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `min_principal_amount` decimal(19,6) NOT NULL,
   `max_principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1457,15 +1457,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1483,14 +1483,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1509,16 +1509,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1537,25 +1537,25 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `status_enum` smallint(5) NOT NULL DEFAULT '300',
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `status_enum` SMALLINT NOT NULL DEFAULT '300',
   `activation_date` date DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_annual_interest_rate` decimal(19,6) NOT NULL,
-  `interest_compounding_period_enum` smallint(5) NOT NULL,
-  `interest_calculation_type_enum` smallint(5) NOT NULL,
-  `interest_calculation_days_in_year_type_enum` smallint(5) NOT NULL,
+  `interest_compounding_period_enum` SMALLINT NOT NULL,
+  `interest_calculation_type_enum` SMALLINT NOT NULL,
+  `interest_calculation_days_in_year_type_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   `lockedin_until_date_derived` date DEFAULT NULL,
   `total_deposits_derived` decimal(19,6) DEFAULT NULL,
   `total_withdrawals_derived` decimal(19,6) DEFAULT NULL,
@@ -1571,7 +1571,7 @@ CREATE TABLE `m_savings_account` (
   CONSTRAINT `FKSA00000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKSA00000000000002` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FKSA00000000000003` FOREIGN KEY (`product_id`) REFERENCES `m_savings_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1589,22 +1589,22 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `savings_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `savings_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
+  `is_reversed` tinyint NOT NULL,
   `running_balance_derived` decimal(19,6) DEFAULT NULL,
-  `balance_number_of_days_derived` int(11) DEFAULT NULL,
+  `balance_number_of_days_derived` INT DEFAULT NULL,
   `balance_end_date_derived` date DEFAULT NULL,
   `cumulative_balance_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FKSAT0000000001` (`savings_account_id`),
   CONSTRAINT `FKSAT0000000001` FOREIGN KEY (`savings_account_id`) REFERENCES `m_savings_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1622,23 +1622,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_product`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_product` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_annual_interest_rate` decimal(19,6) NOT NULL,
-  `interest_compounding_period_enum` smallint(5) NOT NULL,
-  `interest_calculation_type_enum` smallint(5) NOT NULL,
-  `interest_calculation_days_in_year_type_enum` smallint(5) NOT NULL,
+  `interest_compounding_period_enum` SMALLINT NOT NULL,
+  `interest_calculation_type_enum` SMALLINT NOT NULL,
+  `interest_calculation_days_in_year_type_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `sp_unq_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1656,11 +1656,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_staff`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_staff` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_loan_officer` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_loan_officer` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `display_name` varchar(100) NOT NULL,
@@ -1668,7 +1668,7 @@ CREATE TABLE `m_staff` (
   UNIQUE KEY `display_name` (`display_name`),
   KEY `FK_m_staff_m_office` (`office_id`),
   CONSTRAINT `FK_m_staff_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1687,16 +1687,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `r_enum_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `r_enum_value` (
   `enum_name` varchar(100) NOT NULL,
-  `enum_id` int(11) NOT NULL,
+  `enum_id` INT NOT NULL,
   `enum_message_property` varchar(100) NOT NULL,
   `enum_value` varchar(100) NOT NULL,
   PRIMARY KEY (`enum_name`,`enum_id`),
   UNIQUE KEY `enum_message_property` (`enum_name`,`enum_message_property`),
   UNIQUE KEY `enum_value` (`enum_name`,`enum_value`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1715,18 +1715,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `ref_loan_transaction_processing_strategy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `ref_loan_transaction_processing_strategy` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(100) DEFAULT NULL,
   `name` varchar(255) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ltp_strategy_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1745,11 +1745,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `rpt_sequence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `rpt_sequence` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1767,24 +1767,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `schema_version`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `schema_version` (
-  `version_rank` int(11) NOT NULL,
-  `installed_rank` int(11) NOT NULL,
+  `version_rank` INT NOT NULL,
+  `installed_rank` INT NOT NULL,
   `version` varchar(50) NOT NULL,
   `description` varchar(200) NOT NULL,
   `type` varchar(20) NOT NULL,
   `script` varchar(1000) NOT NULL,
-  `checksum` int(11) DEFAULT NULL,
+  `checksum` INT DEFAULT NULL,
   `installed_by` varchar(100) NOT NULL,
   `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `execution_time` int(11) NOT NULL,
-  `success` tinyint(1) NOT NULL,
+  `execution_time` INT NOT NULL,
+  `success` tinyint NOT NULL,
   PRIMARY KEY (`version`),
   KEY `schema_version_vr_idx` (`version_rank`),
   KEY `schema_version_ir_idx` (`installed_rank`),
   KEY `schema_version_s_idx` (`success`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1803,9 +1803,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_parameter` (
-  `parameter_id` int(11) NOT NULL AUTO_INCREMENT,
+  `parameter_id` INT NOT NULL AUTO_INCREMENT,
   `parameter_name` varchar(45) NOT NULL,
   `parameter_variable` varchar(45) DEFAULT NULL,
   `parameter_label` varchar(45) NOT NULL,
@@ -1816,12 +1816,12 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
-  `parent_parameter_id` int(11) DEFAULT NULL,
+  `parent_parameter_id` INT DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
   UNIQUE KEY `name_UNIQUE` (`parameter_name`),
   KEY `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
   CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1830,7 +1830,7 @@ CREATE TABLE `stretchy_parameter` (
 
 LOCK TABLES `stretchy_parameter` WRITE;
 /*!40000 ALTER TABLE `stretchy_parameter` DISABLE KEYS */;
-INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
+INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
 /*!40000 ALTER TABLE `stretchy_parameter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1840,20 +1840,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report` (
-  `report_id` int(11) NOT NULL AUTO_INCREMENT,
+  `report_id` INT NOT NULL AUTO_INCREMENT,
   `report_name` varchar(100) NOT NULL,
   `report_type` varchar(20) NOT NULL,
   `report_subtype` varchar(20) DEFAULT NULL,
   `report_category` varchar(45) DEFAULT NULL,
   `report_sql` text,
   `description` text,
-  `core_report` tinyint(1) DEFAULT '0',
-  `use_report` tinyint(1) DEFAULT '0',
+  `core_report` tinyint DEFAULT '0',
+  `use_report` tinyint DEFAULT '0',
   PRIMARY KEY (`report_id`),
   UNIQUE KEY `report_name_UNIQUE` (`report_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1862,7 +1862,7 @@ CREATE TABLE `stretchy_report` (
 
 LOCK TABLES `stretchy_report` WRITE;
 /*!40000 ALTER TABLE `stretchy_report` DISABLE KEYS */;
-INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
+INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
 /*!40000 ALTER TABLE `stretchy_report` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1872,14 +1872,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report_parameter` (
-  `report_id` int(11) NOT NULL,
-  `parameter_id` int(11) NOT NULL,
+  `report_id` INT NOT NULL,
+  `parameter_id` INT NOT NULL,
   `report_parameter_name` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`report_id`,`parameter_id`),
   UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1898,12 +1898,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `x_registered_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `x_registered_table` (
   `registered_table_name` varchar(50) NOT NULL,
   `application_table_name` varchar(50) NOT NULL,
   PRIMARY KEY (`registered_table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql b/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql
index d108f4a..e255ea6 100644
--- a/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql
+++ b/fineract-db/multi-tenant-demo-backups/ceda/ceda-schema-customisations.sql
@@ -163,76 +163,76 @@ where mc.`code_name` = "YesNo";
 
 DROP TABLE IF EXISTS `client additional data`;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 DROP TABLE IF EXISTS `impact measurement`;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text DEFAULT NULL,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 DROP TABLE IF EXISTS `loan additional data`;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 -- datatables mapping
 INSERT INTO `x_registered_table`
diff --git a/fineract-db/multi-tenant-demo-backups/default-demo/bk_mifostenant-default.sql b/fineract-db/multi-tenant-demo-backups/default-demo/bk_mifostenant-default.sql
index c1f13f2..61da348 100644
--- a/fineract-db/multi-tenant-demo-backups/default-demo/bk_mifostenant-default.sql
+++ b/fineract-db/multi-tenant-demo-backups/default-demo/bk_mifostenant-default.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -74,14 +74,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -111,23 +111,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_entry` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `manual_entry` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `entity_type_enum` smallint(5) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_type_enum` SMALLINT DEFAULT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -141,7 +141,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -159,15 +159,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -185,13 +185,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -210,49 +210,49 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `client additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `client additional data` (
-  `client_id` bigint(20) NOT NULL,
-  `Gender_cd` int(11) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `Gender_cd` INT NOT NULL,
   `Date of Birth` date NOT NULL,
   `Home address` text NOT NULL,
   `Telephone number` varchar(20) NOT NULL,
   `Telephone number (2nd)` varchar(20) NOT NULL,
   `Email address` varchar(50) NOT NULL,
-  `EducationLevel_cd` int(11) NOT NULL,
-  `MaritalStatus_cd` int(11) NOT NULL,
-  `Number of children` int(11) NOT NULL,
+  `EducationLevel_cd` INT NOT NULL,
+  `MaritalStatus_cd` INT NOT NULL,
+  `Number of children` INT NOT NULL,
   `Citizenship` varchar(50) NOT NULL,
-  `PovertyStatus_cd` int(11) NOT NULL,
-  `YesNo_cd_Employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of employment` int(11) DEFAULT NULL,
+  `PovertyStatus_cd` INT NOT NULL,
+  `YesNo_cd_Employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of employment` INT DEFAULT NULL,
   `Employer name` varchar(50) DEFAULT NULL,
-  `Number of years` int(11) DEFAULT NULL,
+  `Number of years` INT DEFAULT NULL,
   `Monthly salary` decimal(19,6) DEFAULT NULL,
-  `YesNo_cd_Self employed` int(11) NOT NULL,
-  `FieldOfEmployment_cd_Field of self-employment` int(11) DEFAULT NULL,
+  `YesNo_cd_Self employed` INT NOT NULL,
+  `FieldOfEmployment_cd_Field of self-employment` INT DEFAULT NULL,
   `Business address` text,
-  `Number of employees` int(11) DEFAULT NULL,
+  `Number of employees` INT DEFAULT NULL,
   `Monthly salaries paid` decimal(19,6) DEFAULT NULL,
   `Monthly net income of business activity` decimal(19,6) DEFAULT NULL,
   `Monthly rent` decimal(19,6) DEFAULT NULL,
   `Other income generating activities` varchar(100) DEFAULT NULL,
-  `YesNo_cd_Bookkeeping` int(11) DEFAULT NULL,
-  `YesNo_cd_Loans with other institutions` int(11) NOT NULL,
+  `YesNo_cd_Bookkeeping` INT DEFAULT NULL,
+  `YesNo_cd_Loans with other institutions` INT NOT NULL,
   `From whom` varchar(100) DEFAULT NULL,
   `Amount` decimal(19,6) DEFAULT NULL,
   `Interest rate pa` decimal(19,6) DEFAULT NULL,
-  `Number of people depending on overal income` int(11) NOT NULL,
-  `YesNo_cd_Bank account` int(11) NOT NULL,
-  `YesNo_cd_Business plan provided` int(11) NOT NULL,
-  `YesNo_cd_Access to internet` int(11) DEFAULT NULL,
+  `Number of people depending on overal income` INT NOT NULL,
+  `YesNo_cd_Bank account` INT NOT NULL,
+  `YesNo_cd_Business plan provided` INT NOT NULL,
+  `YesNo_cd_Access to internet` INT DEFAULT NULL,
   `Introduced by` varchar(100) DEFAULT NULL,
   `Known to introducer since` varchar(100) NOT NULL,
   `Last visited by` varchar(100) DEFAULT NULL,
   `Last visited on` date NOT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_client_additional_data` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -270,19 +270,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_client_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_client_details` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_extra_client_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -300,19 +300,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_family_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_family_details` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
   `Name` varchar(40) DEFAULT NULL,
   `Date of Birth` date DEFAULT NULL,
-  `Points Score` int(11) DEFAULT NULL,
-  `Education_cd_Highest` int(11) DEFAULT NULL,
+  `Points Score` INT DEFAULT NULL,
+  `Education_cd_Highest` INT DEFAULT NULL,
   `Other Notes` text,
   PRIMARY KEY (`id`),
   KEY `FK_Extra Family Details Data_1` (`client_id`),
   CONSTRAINT `FK_family_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -330,19 +330,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_loan_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_loan_details` (
-  `loan_id` bigint(20) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_extra_loan_details` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -360,19 +360,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `impact measurement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `impact measurement` (
-  `loan_id` bigint(20) NOT NULL,
-  `YesNo_cd_RepaidOnSchedule` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `YesNo_cd_RepaidOnSchedule` INT NOT NULL,
   `ReasonNotRepaidOnSchedule` text,
   `How was Loan Amount Invested` text NOT NULL,
   `Additional Income Generated` decimal(19,6) NOT NULL,
   `Additional Income Used For` text NOT NULL,
-  `YesNo_cd_NewJobsCreated` int(11) NOT NULL,
-  `Number of Jobs Created` bigint(20) DEFAULT NULL,
+  `YesNo_cd_NewJobsCreated` INT NOT NULL,
+  `Number of Jobs Created` BIGINT DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_impact measurement` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -390,20 +390,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `loan additional data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `loan additional data` (
-  `loan_id` bigint(20) NOT NULL,
-  `PurposeOfLoan_cd` int(11) NOT NULL,
-  `CollateralType_cd` int(11) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
+  `PurposeOfLoan_cd` INT NOT NULL,
+  `CollateralType_cd` INT NOT NULL,
   `Collateral notes` text NOT NULL,
-  `YesNo_cd_Guarantor` int(11) NOT NULL,
+  `YesNo_cd_Guarantor` INT NOT NULL,
   `Guarantor name` varchar(100) DEFAULT NULL,
   `Guarantor relation` varchar(100) DEFAULT NULL,
   `Guarantor address` varchar(100) DEFAULT NULL,
   `Guarantor telephone number` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_loan_additional_data` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -421,11 +421,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -440,7 +440,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -459,16 +459,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -487,27 +487,27 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `title` varchar(50) NOT NULL,
   `description` varchar(100) DEFAULT NULL,
   `location` varchar(50) DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `duration` smallint(6) DEFAULT NULL,
-  `calendar_type_enum` smallint(5) NOT NULL,
-  `repeating` tinyint(1) NOT NULL DEFAULT '0',
+  `duration` SMALLINT DEFAULT NULL,
+  `calendar_type_enum` SMALLINT NOT NULL,
+  `repeating` tinyint NOT NULL DEFAULT '0',
   `recurrence` varchar(100) DEFAULT NULL,
-  `remind_by_enum` smallint(5) DEFAULT NULL,
-  `first_reminder` smallint(11) DEFAULT NULL,
-  `second_reminder` smallint(11) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `remind_by_enum` SMALLINT DEFAULT NULL,
+  `first_reminder` smallint DEFAULT NULL,
+  `second_reminder` smallint DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -525,16 +525,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_calendar_instance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_calendar_instance` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `calendar_id` bigint(20) NOT NULL,
-  `entity_id` bigint(20) NOT NULL,
-  `entity_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `calendar_id` BIGINT NOT NULL,
+  `entity_id` BIGINT NOT NULL,
+  `entity_type_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_calendar_m_calendar_instance` (`calendar_id`),
   CONSTRAINT `FK_m_calendar_m_calendar_instance` FOREIGN KEY (`calendar_id`) REFERENCES `m_calendar` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -552,21 +552,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -584,11 +584,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -597,13 +597,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -621,15 +621,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -639,7 +639,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -657,14 +657,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -683,17 +683,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -712,17 +712,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -741,19 +741,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -771,15 +771,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -797,17 +797,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
-  `staff_id` bigint(20) DEFAULT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
-  `level_Id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
+  `staff_id` BIGINT DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
+  `level_Id` INT NOT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`,`level_Id`),
   UNIQUE KEY `external_id` (`external_id`,`level_Id`),
@@ -819,7 +819,7 @@ CREATE TABLE `m_group` (
   CONSTRAINT `Parent_Id_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK_m_group_level` FOREIGN KEY (`level_Id`) REFERENCES `m_group_level` (`id`),
   CONSTRAINT `FK_m_group_m_staff` FOREIGN KEY (`staff_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -837,15 +837,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -863,18 +863,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_level` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent_id` int(11) DEFAULT NULL,
-  `super_parent` tinyint(1) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `parent_id` INT DEFAULT NULL,
+  `super_parent` tinyint NOT NULL,
   `level_name` varchar(100) NOT NULL,
-  `recursable` tinyint(1) NOT NULL,
-  `can_have_clients` tinyint(1) NOT NULL,
+  `recursable` tinyint NOT NULL,
+  `can_have_clients` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `Parent_levelId_reference` (`parent_id`),
   CONSTRAINT `Parent_levelId_reference` FOREIGN KEY (`parent_id`) REFERENCES `m_group_level` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -893,12 +893,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -914,7 +914,7 @@ CREATE TABLE `m_guarantor` (
   PRIMARY KEY (`id`),
   KEY `FK_m_guarantor_m_loan` (`loan_id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -932,46 +932,46 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `loanpurpose_cv_id` int(11) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `loanpurpose_cv_id` INT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `submittedon_date` date DEFAULT NULL,
-  `submittedon_userid` bigint(20) DEFAULT NULL,
+  `submittedon_userid` BIGINT DEFAULT NULL,
   `approvedon_date` date DEFAULT NULL,
-  `approvedon_userid` bigint(20) DEFAULT NULL,
+  `approvedon_userid` BIGINT DEFAULT NULL,
   `expected_disbursedon_date` date DEFAULT NULL,
   `expected_firstrepaymenton_date` date DEFAULT NULL,
   `interest_calculated_from_date` date DEFAULT NULL,
   `disbursedon_date` date DEFAULT NULL,
-  `disbursedon_userid` bigint(20) DEFAULT NULL,
+  `disbursedon_userid` BIGINT DEFAULT NULL,
   `expected_maturedon_date` date DEFAULT NULL,
   `maturedon_date` date DEFAULT NULL,
   `closedon_date` date DEFAULT NULL,
-  `closedon_userid` bigint(20) DEFAULT NULL,
+  `closedon_userid` BIGINT DEFAULT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `principal_disbursed_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `principal_repaid_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -1000,12 +1000,12 @@ CREATE TABLE `m_loan` (
   `total_writtenoff_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `total_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `rejectedon_date` date DEFAULT NULL,
-  `rejectedon_userid` bigint(20) DEFAULT NULL,
+  `rejectedon_userid` BIGINT DEFAULT NULL,
   `rescheduledon_date` date DEFAULT NULL,
   `withdrawnon_date` date DEFAULT NULL,
-  `withdrawnon_userid` bigint(20) DEFAULT NULL,
+  `withdrawnon_userid` BIGINT DEFAULT NULL,
   `writtenoffon_date` date DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -1035,7 +1035,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_submittedon_userid` FOREIGN KEY (`submittedon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_withdrawnon_userid` FOREIGN KEY (`withdrawnon_userid`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1053,9 +1053,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_arrears_aging`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_arrears_aging` (
-  `loan_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL AUTO_INCREMENT,
   `principal_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `interest_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
   `fee_charges_overdue_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
@@ -1064,7 +1064,7 @@ CREATE TABLE `m_loan_arrears_aging` (
   `overdue_since_date_derived` date DEFAULT NULL,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `m_loan_arrears_aging_ibfk_1` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1082,15 +1082,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -1098,14 +1098,14 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
-  `waived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
+  `waived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1123,18 +1123,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_collateral`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_collateral` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_cv_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_cv_id` INT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_collateral_m_loan` (`loan_id`),
   KEY `FK_collateral_code_value` (`type_cv_id`),
   CONSTRAINT `FK_collateral_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FK_collateral_code_value` FOREIGN KEY (`type_cv_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1152,23 +1152,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1186,13 +1186,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -1208,15 +1208,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1234,12 +1234,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `is_reversed` tinyint NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1249,7 +1249,7 @@ CREATE TABLE `m_loan_transaction` (
   PRIMARY KEY (`id`),
   KEY `FKCFCEA42640BE0710` (`loan_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,19 +1267,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1293,7 +1293,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_note_m_group` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1311,10 +1311,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1324,7 +1324,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1343,13 +1343,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1358,7 +1358,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1376,16 +1376,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1404,17 +1404,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=299 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=299 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1433,24 +1433,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
-  `subresource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
+  `subresource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1465,7 +1465,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1483,34 +1483,34 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1528,15 +1528,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1554,14 +1554,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1580,16 +1580,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1608,24 +1608,24 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `status_enum` smallint(5) NOT NULL DEFAULT '300',
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `status_enum` SMALLINT NOT NULL DEFAULT '300',
   `activation_date` date DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   `lockedin_until_date_derived` date DEFAULT NULL,
   `total_deposits_derived` decimal(19,6) DEFAULT NULL,
   `total_withdrawals_derived` decimal(19,6) DEFAULT NULL,
@@ -1640,7 +1640,7 @@ CREATE TABLE `m_savings_account` (
   CONSTRAINT `FKSA00000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKSA00000000000002` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `FKSA00000000000003` FOREIGN KEY (`product_id`) REFERENCES `m_savings_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1658,18 +1658,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `savings_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `savings_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_reversed` tinyint(1) NOT NULL,
+  `is_reversed` tinyint NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FKSAT0000000001` (`savings_account_id`),
   CONSTRAINT `FKSAT0000000001` FOREIGN KEY (`savings_account_id`) REFERENCES `m_savings_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1687,21 +1687,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_savings_product`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_savings_product` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `nominal_interest_rate_period_frequency_enum` smallint(5) NOT NULL,
+  `nominal_interest_rate_period_frequency_enum` SMALLINT NOT NULL,
   `min_required_opening_balance` decimal(19,6) DEFAULT NULL,
   `lockin_period_frequency` decimal(19,6) DEFAULT NULL,
-  `lockin_period_frequency_enum` smallint(5) DEFAULT NULL,
+  `lockin_period_frequency_enum` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `sp_unq_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1719,11 +1719,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_staff`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_staff` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_loan_officer` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_loan_officer` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `display_name` varchar(100) NOT NULL,
@@ -1731,7 +1731,7 @@ CREATE TABLE `m_staff` (
   UNIQUE KEY `display_name` (`display_name`),
   KEY `FK_m_staff_m_office` (`office_id`),
   CONSTRAINT `FK_m_staff_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1749,16 +1749,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `r_enum_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `r_enum_value` (
   `enum_name` varchar(100) NOT NULL,
-  `enum_id` int(11) NOT NULL,
+  `enum_id` INT NOT NULL,
   `enum_message_property` varchar(100) NOT NULL,
   `enum_value` varchar(100) NOT NULL,
   PRIMARY KEY (`enum_name`,`enum_id`),
   UNIQUE KEY `enum_message_property` (`enum_name`,`enum_message_property`),
   UNIQUE KEY `enum_value` (`enum_name`,`enum_value`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1777,18 +1777,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `ref_loan_transaction_processing_strategy`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `ref_loan_transaction_processing_strategy` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(100) DEFAULT NULL,
   `name` varchar(255) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ltp_strategy_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1807,11 +1807,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `rpt_sequence`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `rpt_sequence` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1829,9 +1829,9 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_parameter` (
-  `parameter_id` int(11) NOT NULL AUTO_INCREMENT,
+  `parameter_id` INT NOT NULL AUTO_INCREMENT,
   `parameter_name` varchar(45) NOT NULL,
   `parameter_variable` varchar(45) DEFAULT NULL,
   `parameter_label` varchar(45) NOT NULL,
@@ -1842,12 +1842,12 @@ CREATE TABLE `stretchy_parameter` (
   `selectOne` varchar(1) DEFAULT NULL,
   `selectAll` varchar(1) DEFAULT NULL,
   `parameter_sql` text,
-  `parent_parameter_id` int(11) DEFAULT NULL,
+  `parent_parameter_id` INT DEFAULT NULL,
   PRIMARY KEY (`parameter_id`),
   UNIQUE KEY `name_UNIQUE` (`parameter_name`),
   KEY `fk_stretchy_parameter_0001_idx` (`parent_parameter_id`),
   CONSTRAINT `fk_stretchy_parameter_0001` FOREIGN KEY (`parent_parameter_id`) REFERENCES `stretchy_parameter` (`parameter_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1004 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1856,7 +1856,7 @@ CREATE TABLE `stretchy_parameter` (
 
 LOCK TABLES `stretchy_parameter` WRITE;
 /*!40000 ALTER TABLE `stretchy_parameter` DISABLE KEYS */;
-INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
+INSERT INTO `stretchy_parameter` VALUES (1,'startDateSelect','startDate','startDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(2,'endDateSelect','endDate','endDate','date','date','today',NULL,NULL,NULL,NULL,NULL),(3,'obligDateTypeSelect','obligDateType','obligDateType','select','number','0',NULL,NULL,NULL,'select * from\r\n(select 1 as id, \"Closed\" as `name` union all\r\nselect 2, \"Disbursal\" ) x\r\norder by x.`id`',NULL),(5,'OfficeIdSelectOne','officeId','Office','select','nu [...]
 /*!40000 ALTER TABLE `stretchy_parameter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1866,20 +1866,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report` (
-  `report_id` int(11) NOT NULL AUTO_INCREMENT,
+  `report_id` INT NOT NULL AUTO_INCREMENT,
   `report_name` varchar(100) NOT NULL,
   `report_type` varchar(20) NOT NULL,
   `report_subtype` varchar(20) DEFAULT NULL,
   `report_category` varchar(45) DEFAULT NULL,
   `report_sql` text,
   `description` text,
-  `core_report` tinyint(1) DEFAULT '0',
-  `use_report` tinyint(1) DEFAULT '0',
+  `core_report` tinyint DEFAULT '0',
+  `use_report` tinyint DEFAULT '0',
   PRIMARY KEY (`report_id`),
   UNIQUE KEY `report_name_UNIQUE` (`report_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1888,7 +1888,7 @@ CREATE TABLE `stretchy_report` (
 
 LOCK TABLES `stretchy_report` WRITE;
 /*!40000 ALTER TABLE `stretchy_report` DISABLE KEYS */;
-INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
+INSERT INTO `stretchy_report` VALUES (1,'Client Listing','Table',NULL,'Client','select \r\nconcat(repeat(\"..\",   \r\n   ((LENGTH(ounder.`hierarchy`) - LENGTH(REPLACE(ounder.`hierarchy`, \'.\', \'\')) - 1))), ounder.`name`) as \"Office/Branch\",\r\n c.account_no as \"Client Account No.\",  \r\nc.display_name as \"Name\",  \n\nc.joined_date as \"Joined\", c.external_id as \"External Id\"\r\nfrom m_office o \r\njoin m_office ounder on ounder.hierarchy like concat(o.hierarchy, \'%\')\r\nan [...]
 /*!40000 ALTER TABLE `stretchy_report` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1898,14 +1898,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `stretchy_report_parameter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `stretchy_report_parameter` (
-  `report_id` int(11) NOT NULL,
-  `parameter_id` int(11) NOT NULL,
+  `report_id` INT NOT NULL,
+  `parameter_id` INT NOT NULL,
   `report_parameter_name` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`report_id`,`parameter_id`),
   UNIQUE KEY `report_id_name_UNIQUE` (`report_id`,`report_parameter_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1924,12 +1924,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `x_registered_table`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `x_registered_table` (
   `registered_table_name` varchar(50) NOT NULL,
   `application_table_name` varchar(50) NOT NULL,
   PRIMARY KEY (`registered_table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
diff --git a/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql b/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql
index 0c19e32..cdaa53c 100644
--- a/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql
+++ b/fineract-db/multi-tenant-demo-backups/default-demo/extra-datatables-and-code-values.sql
@@ -70,45 +70,45 @@ where mc.`code_name` = "Education";
 
 DROP TABLE IF EXISTS `extra_client_details`;
 CREATE TABLE `extra_client_details` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_extra_client_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 DROP TABLE IF EXISTS `extra_family_details`;
 CREATE TABLE `extra_family_details` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
   `Name` varchar(40) DEFAULT NULL,
   `Date of Birth` date DEFAULT NULL,
-  `Points Score` int(11) DEFAULT NULL,
-  `Education_cd_Highest` int(11) DEFAULT NULL,
+  `Points Score` INT DEFAULT NULL,
+  `Education_cd_Highest` INT DEFAULT NULL,
   `Other Notes` text,
   PRIMARY KEY (`id`),
   KEY `FK_Extra Family Details Data_1` (`client_id`),
   CONSTRAINT `FK_family_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 DROP TABLE IF EXISTS `extra_loan_details`;
 CREATE TABLE `extra_loan_details` (
-  `loan_id` bigint(20) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_extra_loan_details` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 
 -- datatables mapping
 INSERT INTO `x_registered_table`
diff --git a/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql b/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql
index f94b930..9a0982f 100644
--- a/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql
+++ b/fineract-db/multi-tenant-demo-backups/gk-maarg/0001b-gk-datatables.sql
@@ -19,7 +19,7 @@
 
 DROP TABLE IF EXISTS `risk_analysis`;
 CREATE TABLE `risk_analysis` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `proposed_loan_amount` decimal(19,6) DEFAULT NULL,
   `assets_cash` decimal(19,6) DEFAULT NULL,
   `assets_bank_accounts` decimal(19,6) DEFAULT NULL,
@@ -55,4 +55,4 @@ CREATE TABLE `risk_analysis` (
   `fi_repayment_capacity` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_risk_analysis_1` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
\ No newline at end of file
diff --git a/fineract-db/multi-tenant-demo-backups/latam-demo/bk_latam.sql b/fineract-db/multi-tenant-demo-backups/latam-demo/bk_latam.sql
index bfe872d..daa11df 100644
--- a/fineract-db/multi-tenant-demo-backups/latam-demo/bk_latam.sql
+++ b/fineract-db/multi-tenant-demo-backups/latam-demo/bk_latam.sql
@@ -26,7 +26,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES UTF8MB4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -40,22 +40,22 @@
 
 DROP TABLE IF EXISTS `acc_gl_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(45) NOT NULL,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `parent_id` BIGINT DEFAULT NULL,
   `gl_code` varchar(45) NOT NULL,
-  `disabled` tinyint(1) NOT NULL DEFAULT '0',
-  `manual_journal_entries_allowed` tinyint(1) NOT NULL DEFAULT '1',
-  `account_usage` tinyint(1) NOT NULL DEFAULT '2',
-  `classification_enum` smallint(5) NOT NULL,
+  `disabled` tinyint NOT NULL DEFAULT '0',
+  `manual_journal_entries_allowed` tinyint NOT NULL DEFAULT '1',
+  `account_usage` tinyint NOT NULL DEFAULT '2',
+  `classification_enum` SMALLINT NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `acc_gl_code` (`gl_code`),
   KEY `FK_ACC_0000000001` (`parent_id`),
   CONSTRAINT `FK_ACC_0000000001` FOREIGN KEY (`parent_id`) REFERENCES `acc_gl_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -73,14 +73,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_closure`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_closure` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `closing_date` date NOT NULL,
-  `is_deleted` int(20) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `is_deleted` INT NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   `comments` varchar(500) DEFAULT NULL,
@@ -92,7 +92,7 @@ CREATE TABLE `acc_gl_closure` (
   CONSTRAINT `FK_acc_gl_closure_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_closure_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -110,23 +110,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_gl_journal_entry`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_gl_journal_entry` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `account_id` bigint(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
-  `reversal_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `account_id` BIGINT NOT NULL,
+  `office_id` BIGINT NOT NULL,
+  `reversal_id` BIGINT DEFAULT NULL,
   `transaction_id` varchar(50) NOT NULL,
-  `reversed` tinyint(1) NOT NULL DEFAULT '0',
-  `portfolio_generated` tinyint(1) NOT NULL DEFAULT '0',
+  `reversed` tinyint NOT NULL DEFAULT '0',
+  `portfolio_generated` tinyint NOT NULL DEFAULT '0',
   `entry_date` date NOT NULL,
-  `type_enum` smallint(50) NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   `entity_type` varchar(50) DEFAULT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
-  `createdby_id` bigint(20) NOT NULL,
-  `lastmodifiedby_id` bigint(20) NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
+  `createdby_id` BIGINT NOT NULL,
+  `lastmodifiedby_id` BIGINT NOT NULL,
   `created_date` datetime NOT NULL,
   `lastmodified_date` datetime NOT NULL,
   PRIMARY KEY (`id`),
@@ -140,7 +140,7 @@ CREATE TABLE `acc_gl_journal_entry` (
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_appuser_2` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_acc_gl_journal_entry_m_office` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -158,15 +158,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `acc_product_mapping`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `acc_product_mapping` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `gl_account_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `product_type` smallint(5) DEFAULT NULL,
-  `financial_account_type` smallint(5) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `gl_account_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `product_type` SMALLINT DEFAULT NULL,
+  `financial_account_type` SMALLINT DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -184,13 +184,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `c_configuration`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `c_configuration` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(50) DEFAULT NULL,
-  `enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `enabled` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -209,19 +209,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_client_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_client_details` (
-  `client_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`client_id`),
   CONSTRAINT `FK_latam_extra_client_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -239,19 +239,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_family_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_family_details` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
   `Name` varchar(40) DEFAULT NULL,
   `Date of Birth` date DEFAULT NULL,
-  `Points Score` int(11) DEFAULT NULL,
-  `Education_cd_Highest` int(11) DEFAULT NULL,
+  `Points Score` INT DEFAULT NULL,
+  `Education_cd_Highest` INT DEFAULT NULL,
   `Other Notes` text,
   PRIMARY KEY (`id`),
   KEY `FK_Extra Family Details Data_1` (`client_id`),
   CONSTRAINT `FK_latam_family_details` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -269,19 +269,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `extra_loan_details`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `extra_loan_details` (
-  `loan_id` bigint(20) NOT NULL,
+  `loan_id` BIGINT NOT NULL,
   `Business Description` varchar(100) DEFAULT NULL,
-  `Years in Business` int(11) DEFAULT NULL,
-  `Gender_cd` int(11) DEFAULT NULL,
+  `Years in Business` INT DEFAULT NULL,
+  `Gender_cd` INT DEFAULT NULL,
   `Education_cv` varchar(60) DEFAULT NULL,
   `Next Visit` date DEFAULT NULL,
   `Highest Rate Paid` decimal(19,6) DEFAULT NULL,
   `Comment` text,
   PRIMARY KEY (`loan_id`),
   CONSTRAINT `FK_latam_extra_loan_details` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -299,11 +299,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `office_id` BIGINT DEFAULT NULL,
   `username` varchar(100) NOT NULL,
   `firstname` varchar(100) NOT NULL,
   `lastname` varchar(100) NOT NULL,
@@ -318,7 +318,7 @@ CREATE TABLE `m_appuser` (
   UNIQUE KEY `username_org` (`username`),
   KEY `FKB3D587CE0DD567A` (`office_id`),
   CONSTRAINT `FKB3D587CE0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -337,16 +337,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_appuser_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_appuser_role` (
-  `appuser_id` bigint(20) NOT NULL,
-  `role_id` bigint(20) NOT NULL,
+  `appuser_id` BIGINT NOT NULL,
+  `role_id` BIGINT NOT NULL,
   PRIMARY KEY (`appuser_id`,`role_id`),
   KEY `FK7662CE59B4100309` (`appuser_id`),
   KEY `FK7662CE5915CEC7AB` (`role_id`),
   CONSTRAINT `FK7662CE5915CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`),
   CONSTRAINT `FK7662CE59B4100309` FOREIGN KEY (`appuser_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -365,21 +365,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `charge_applies_to_enum` smallint(5) NOT NULL,
-  `charge_time_enum` smallint(5) NOT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_applies_to_enum` SMALLINT NOT NULL,
+  `charge_time_enum` SMALLINT NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `is_active` tinyint(1) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `is_active` tinyint NOT NULL,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -397,11 +397,11 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
-  `office_id` bigint(20) NOT NULL,
+  `office_id` BIGINT NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `middlename` varchar(50) DEFAULT NULL,
@@ -410,13 +410,13 @@ CREATE TABLE `m_client` (
   `display_name` varchar(100) NOT NULL,
   `image_key` varchar(500) DEFAULT NULL,
   `joined_date` date DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `FKCE00CAB3E0DD567A` (`office_id`),
   CONSTRAINT `FKCE00CAB3E0DD567A` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -434,15 +434,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_client_identifier`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_client_identifier` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `document_type_id` int(11) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `document_type_id` INT NOT NULL,
   `document_key` varchar(50) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -452,7 +452,7 @@ CREATE TABLE `m_client_identifier` (
   KEY `FK_m_client_document_m_code_value` (`document_type_id`),
   CONSTRAINT `FK_m_client_document_m_client` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK_m_client_document_m_code_value` FOREIGN KEY (`document_type_id`) REFERENCES `m_code_value` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -470,14 +470,14 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `code_name` varchar(100) DEFAULT NULL,
-  `is_system_defined` tinyint(1) NOT NULL DEFAULT '0',
+  `is_system_defined` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_name` (`code_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -496,17 +496,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_code_value`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_code_value` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code_id` int(11) NOT NULL,
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `code_id` INT NOT NULL,
   `code_value` varchar(100) DEFAULT NULL,
-  `order_position` int(11) NOT NULL DEFAULT '0',
+  `order_position` INT NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code_value` (`code_id`,`code_value`),
   KEY `FKCFCEA42640BE071Z` (`code_id`),
   CONSTRAINT `FKCFCEA42640BE071Z` FOREIGN KEY (`code_id`) REFERENCES `m_code` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -525,17 +525,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -554,21 +554,21 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_deposit_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_deposit_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `status_enum` smallint(5) NOT NULL DEFAULT '0',
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `status_enum` SMALLINT NOT NULL DEFAULT '0',
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) NOT NULL,
-  `product_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `product_id` BIGINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `deposit_amount` decimal(19,6) DEFAULT NULL,
   `maturity_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `tenure_months` int(11) NOT NULL,
-  `interest_compounded_every` smallint(5) NOT NULL DEFAULT '1',
-  `interest_compounded_every_period_enum` smallint(5) NOT NULL DEFAULT '2',
+  `tenure_months` INT NOT NULL,
+  `interest_compounded_every` SMALLINT NOT NULL DEFAULT '1',
+  `interest_compounded_every_period_enum` SMALLINT NOT NULL DEFAULT '2',
   `projected_commencement_date` date NOT NULL,
   `actual_commencement_date` date DEFAULT NULL,
   `matures_on_date` datetime DEFAULT NULL,
@@ -576,27 +576,27 @@ CREATE TABLE `m_deposit_account` (
   `actual_interest_accrued` decimal(19,6) DEFAULT NULL,
   `projected_total_maturity_amount` decimal(19,6) NOT NULL,
   `actual_total_amount` decimal(19,6) DEFAULT NULL,
-  `is_compounding_interest_allowed` tinyint(1) NOT NULL DEFAULT '0',
+  `is_compounding_interest_allowed` tinyint NOT NULL DEFAULT '0',
   `interest_paid` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_interest_withdrawable` tinyint(1) NOT NULL DEFAULT '0',
+  `is_interest_withdrawable` tinyint NOT NULL DEFAULT '0',
   `available_interest` decimal(19,6) DEFAULT '0.000000',
   `interest_posted_amount` decimal(19,6) DEFAULT '0.000000',
   `last_interest_posted_date` date DEFAULT NULL,
   `next_interest_posting_date` date DEFAULT NULL,
-  `is_renewal_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `renewed_account_id` bigint(20) DEFAULT NULL,
-  `is_preclosure_allowed` tinyint(1) NOT NULL DEFAULT '0',
+  `is_renewal_allowed` tinyint NOT NULL DEFAULT '0',
+  `renewed_account_id` BIGINT DEFAULT NULL,
+  `is_preclosure_allowed` tinyint NOT NULL DEFAULT '0',
   `pre_closure_interest_rate` decimal(19,6) NOT NULL,
-  `is_lock_in_period_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `lock_in_period` bigint(20) DEFAULT NULL,
-  `lock_in_period_type` smallint(5) NOT NULL DEFAULT '2',
+  `is_lock_in_period_allowed` tinyint NOT NULL DEFAULT '0',
+  `lock_in_period` BIGINT DEFAULT NULL,
+  `lock_in_period_type` SMALLINT NOT NULL DEFAULT '2',
   `withdrawnon_date` datetime DEFAULT NULL,
   `rejectedon_date` datetime DEFAULT NULL,
   `closedon_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `deposit_acc_external_id` (`external_id`),
   KEY `FKKW0000000000001` (`client_id`),
@@ -605,7 +605,7 @@ CREATE TABLE `m_deposit_account` (
   CONSTRAINT `FKKW0000000000001` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FKKW0000000000002` FOREIGN KEY (`product_id`) REFERENCES `m_product_deposit` (`id`),
   CONSTRAINT `FKKW0000000000003` FOREIGN KEY (`renewed_account_id`) REFERENCES `m_deposit_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -623,12 +623,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_deposit_account_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_deposit_account_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `deposit_account_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
-  `contra_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `deposit_account_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
+  `contra_id` BIGINT DEFAULT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
   `interest` decimal(19,6) NOT NULL,
@@ -638,7 +638,7 @@ CREATE TABLE `m_deposit_account_transaction` (
   KEY `FKKW00000000000006` (`contra_id`),
   CONSTRAINT `FKKW00000000000005` FOREIGN KEY (`deposit_account_id`) REFERENCES `m_deposit_account` (`id`),
   CONSTRAINT `FKKW00000000000006` FOREIGN KEY (`contra_id`) REFERENCES `m_deposit_account_transaction` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -656,19 +656,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_document`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_document` (
-  `id` int(20) NOT NULL AUTO_INCREMENT,
+  `id` INT NOT NULL AUTO_INCREMENT,
   `parent_entity_type` varchar(50) NOT NULL,
-  `parent_entity_id` int(20) NOT NULL DEFAULT '0',
+  `parent_entity_id` INT NOT NULL DEFAULT '0',
   `name` varchar(250) NOT NULL,
   `file_name` varchar(250) NOT NULL,
-  `size` int(20) DEFAULT '0',
+  `size` INT DEFAULT '0',
   `type` varchar(50) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
   `location` varchar(500) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -686,15 +686,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_fund`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_fund` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `fund_name_org` (`name`),
   UNIQUE KEY `fund_externalid_org` (`external_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -712,19 +712,19 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `office_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `office_id` BIGINT NOT NULL,
   `name` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `external_id` (`external_id`),
   KEY `office_id` (`office_id`),
   CONSTRAINT `m_group_ibfk_1` FOREIGN KEY (`office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -742,15 +742,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_group_client`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_group_client` (
-  `group_id` bigint(20) NOT NULL,
-  `client_id` bigint(20) NOT NULL,
+  `group_id` BIGINT NOT NULL,
+  `client_id` BIGINT NOT NULL,
   PRIMARY KEY (`group_id`,`client_id`),
   KEY `client_id` (`client_id`),
   CONSTRAINT `m_group_client_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`),
   CONSTRAINT `m_group_client_ibfk_2` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -768,12 +768,12 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_guarantor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_guarantor` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `type_enum` smallint(5) NOT NULL,
-  `entity_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `type_enum` SMALLINT NOT NULL,
+  `entity_id` BIGINT DEFAULT NULL,
   `firstname` varchar(50) DEFAULT NULL,
   `lastname` varchar(50) DEFAULT NULL,
   `dob` date DEFAULT NULL,
@@ -789,7 +789,7 @@ CREATE TABLE `m_guarantor` (
   PRIMARY KEY (`id`),
   KEY `FK_m_guarantor_m_loan` (`loan_id`),
   CONSTRAINT `FK_m_guarantor_m_loan` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -807,33 +807,33 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `account_no` varchar(20) NOT NULL,
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `product_id` bigint(20) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
-  `guarantor_id` bigint(20) DEFAULT NULL,
-  `loan_status_id` smallint(5) NOT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `product_id` BIGINT DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
+  `guarantor_id` BIGINT DEFAULT NULL,
+  `loan_status_id` SMALLINT NOT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `term_frequency` smallint(5) NOT NULL DEFAULT '0',
-  `term_period_frequency_enum` smallint(5) NOT NULL DEFAULT '2',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `term_frequency` SMALLINT NOT NULL DEFAULT '0',
+  `term_period_frequency_enum` SMALLINT NOT NULL DEFAULT '2',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
   `total_charges_due_at_disbursement_derived` decimal(19,6) DEFAULT NULL,
   `submittedon_date` datetime DEFAULT NULL,
   `approvedon_date` datetime DEFAULT NULL,
@@ -848,11 +848,11 @@ CREATE TABLE `m_loan` (
   `rescheduledon_date` datetime DEFAULT NULL,
   `withdrawnon_date` datetime DEFAULT NULL,
   `writtenoffon_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `loan_account_no_UNIQUE` (`account_no`),
   UNIQUE KEY `loan_externalid_UNIQUE` (`external_id`),
@@ -870,7 +870,7 @@ CREATE TABLE `m_loan` (
   CONSTRAINT `FK_loan_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`),
   CONSTRAINT `FK_m_loan_m_staff` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`),
   CONSTRAINT `m_loan_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `m_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -888,15 +888,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_charge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
-  `is_penalty` tinyint(1) NOT NULL DEFAULT '0',
-  `charge_time_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
+  `is_penalty` tinyint NOT NULL DEFAULT '0',
+  `charge_time_enum` SMALLINT NOT NULL,
   `due_for_collection_as_of_date` date DEFAULT NULL,
-  `charge_calculation_enum` smallint(5) NOT NULL,
+  `charge_calculation_enum` SMALLINT NOT NULL,
   `calculation_percentage` decimal(19,6) DEFAULT NULL,
   `calculation_on_amount` decimal(19,6) DEFAULT NULL,
   `amount` decimal(19,6) NOT NULL,
@@ -904,13 +904,13 @@ CREATE TABLE `m_loan_charge` (
   `amount_waived_derived` decimal(19,6) DEFAULT NULL,
   `amount_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `amount_outstanding_derived` decimal(19,6) NOT NULL DEFAULT '0.000000',
-  `is_paid_derived` tinyint(1) NOT NULL DEFAULT '0',
+  `is_paid_derived` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `charge_id` (`charge_id`),
   KEY `m_loan_charge_ibfk_2` (`loan_id`),
   CONSTRAINT `m_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_loan_charge_ibfk_2` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -928,23 +928,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_officer_assignment_history`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_officer_assignment_history` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `loan_officer_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `loan_officer_id` BIGINT DEFAULT NULL,
   `start_date` date NOT NULL,
   `end_date` date DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `fk_m_loan_officer_assignment_history_0001` (`loan_id`),
   KEY `fk_m_loan_officer_assignment_history_0002` (`loan_officer_id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0001` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `fk_m_loan_officer_assignment_history_0002` FOREIGN KEY (`loan_officer_id`) REFERENCES `m_staff` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -962,13 +962,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_repayment_schedule`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_repayment_schedule` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
   `fromdate` date DEFAULT NULL,
   `duedate` date NOT NULL,
-  `installment` smallint(5) NOT NULL,
+  `installment` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) DEFAULT NULL,
   `principal_completed_derived` decimal(19,6) DEFAULT NULL,
   `principal_writtenoff_derived` decimal(19,6) DEFAULT NULL,
@@ -984,15 +984,15 @@ CREATE TABLE `m_loan_repayment_schedule` (
   `penalty_charges_writtenoff_derived` decimal(19,6) DEFAULT NULL,
   `penalty_charges_waived_derived` decimal(19,6) DEFAULT NULL,
   `completed_derived` bit(1) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `interest_waived_derived` decimal(19,6) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK488B92AA40BE0710` (`loan_id`),
   CONSTRAINT `FK488B92AA40BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1010,18 +1010,18 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_loan_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_loan_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `loan_id` bigint(20) NOT NULL,
-  `transaction_type_enum` smallint(5) NOT NULL,
-  `contra_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `loan_id` BIGINT NOT NULL,
+  `transaction_type_enum` SMALLINT NOT NULL,
+  `contra_id` BIGINT DEFAULT NULL,
   `transaction_date` date NOT NULL,
   `amount` decimal(19,6) NOT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   `principal_portion_derived` decimal(19,6) DEFAULT NULL,
   `interest_portion_derived` decimal(19,6) DEFAULT NULL,
   `fee_charges_portion_derived` decimal(19,6) DEFAULT NULL,
@@ -1031,7 +1031,7 @@ CREATE TABLE `m_loan_transaction` (
   KEY `FKCFCEA426FC69F3F1` (`contra_id`),
   CONSTRAINT `FKCFCEA42640BE0710` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`),
   CONSTRAINT `FKCFCEA426FC69F3F1` FOREIGN KEY (`contra_id`) REFERENCES `m_loan_transaction` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1049,20 +1049,20 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_note`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_note` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `client_id` bigint(20) NOT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
-  `loan_transaction_id` bigint(20) DEFAULT NULL,
-  `deposit_account_id` bigint(20) DEFAULT NULL,
-  `saving_account_id` bigint(20) DEFAULT NULL,
-  `note_type_enum` smallint(5) NOT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `client_id` BIGINT NOT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
+  `loan_transaction_id` BIGINT DEFAULT NULL,
+  `deposit_account_id` BIGINT DEFAULT NULL,
+  `saving_account_id` BIGINT DEFAULT NULL,
+  `note_type_enum` SMALLINT NOT NULL,
   `note` varchar(1000) DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `createdby_id` BIGINT DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FK7C9708924D26803` (`loan_transaction_id`),
   KEY `FK7C97089541F0A56` (`createdby_id`),
@@ -1078,7 +1078,7 @@ CREATE TABLE `m_note` (
   CONSTRAINT `FK7C970897179A0CB` FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`),
   CONSTRAINT `FK7C970898F889C3F` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_note_m_deposit_account` FOREIGN KEY (`deposit_account_id`) REFERENCES `m_deposit_account` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1096,10 +1096,10 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `parent_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT DEFAULT NULL,
   `hierarchy` varchar(100) DEFAULT NULL,
   `external_id` varchar(100) DEFAULT NULL,
   `name` varchar(50) NOT NULL,
@@ -1109,7 +1109,7 @@ CREATE TABLE `m_office` (
   UNIQUE KEY `externalid_org` (`external_id`),
   KEY `FK2291C477E2551DCC` (`parent_id`),
   CONSTRAINT `FK2291C477E2551DCC` FOREIGN KEY (`parent_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1128,13 +1128,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_office_transaction`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_office_transaction` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `from_office_id` bigint(20) DEFAULT NULL,
-  `to_office_id` bigint(20) DEFAULT NULL,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `from_office_id` BIGINT DEFAULT NULL,
+  `to_office_id` BIGINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` int(11) NOT NULL,
+  `currency_digits` INT NOT NULL,
   `transaction_amount` decimal(19,6) NOT NULL,
   `transaction_date` date NOT NULL,
   `description` varchar(100) DEFAULT NULL,
@@ -1143,7 +1143,7 @@ CREATE TABLE `m_office_transaction` (
   KEY `FK1E37728B783C5C25` (`from_office_id`),
   CONSTRAINT `FK1E37728B783C5C25` FOREIGN KEY (`from_office_id`) REFERENCES `m_office` (`id`),
   CONSTRAINT `FK1E37728B93C6C1B6` FOREIGN KEY (`to_office_id`) REFERENCES `m_office` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1161,16 +1161,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_organisation_currency`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_organisation_currency` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `code` varchar(3) NOT NULL,
-  `decimal_places` smallint(5) NOT NULL,
+  `decimal_places` SMALLINT NOT NULL,
   `name` varchar(50) NOT NULL,
   `display_symbol` varchar(10) DEFAULT NULL,
   `internationalized_name_code` varchar(50) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1189,17 +1189,17 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_permission` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `grouping` varchar(45) DEFAULT NULL,
   `code` varchar(100) NOT NULL,
   `entity_name` varchar(100) DEFAULT NULL,
   `action_name` varchar(100) DEFAULT NULL,
-  `can_maker_checker` tinyint(1) NOT NULL DEFAULT '1',
+  `can_maker_checker` tinyint NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=237 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=237 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1218,23 +1218,23 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_portfolio_command_source`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_portfolio_command_source` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `action_name` varchar(50) NOT NULL,
   `entity_name` varchar(50) NOT NULL,
-  `office_id` bigint(20) DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `client_id` bigint(20) DEFAULT NULL,
-  `loan_id` bigint(20) DEFAULT NULL,
+  `office_id` BIGINT DEFAULT NULL,
+  `group_id` BIGINT DEFAULT NULL,
+  `client_id` BIGINT DEFAULT NULL,
+  `loan_id` BIGINT DEFAULT NULL,
   `api_get_url` varchar(100) NOT NULL,
-  `resource_id` bigint(20) DEFAULT NULL,
+  `resource_id` BIGINT DEFAULT NULL,
   `command_as_json` text NOT NULL,
-  `maker_id` bigint(20) NOT NULL,
+  `maker_id` BIGINT NOT NULL,
   `made_on_date` datetime NOT NULL,
-  `checker_id` bigint(20) DEFAULT NULL,
+  `checker_id` BIGINT DEFAULT NULL,
   `checked_on_date` datetime DEFAULT NULL,
-  `processing_result_enum` smallint(5) NOT NULL,
+  `processing_result_enum` SMALLINT NOT NULL,
   PRIMARY KEY (`id`),
   KEY `FK_m_maker_m_appuser` (`maker_id`),
   KEY `FK_m_checker_m_appuser` (`checker_id`),
@@ -1249,7 +1249,7 @@ CREATE TABLE `m_portfolio_command_source` (
   KEY `loan_id` (`office_id`),
   CONSTRAINT `FK_m_checker_m_appuser` FOREIGN KEY (`checker_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FK_m_maker_m_appuser` FOREIGN KEY (`maker_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1267,34 +1267,34 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_deposit`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_deposit` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
   `external_id` varchar(100) DEFAULT NULL,
   `description` varchar(500) DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `minimum_balance` decimal(19,6) DEFAULT NULL,
   `maximum_balance` decimal(19,6) DEFAULT NULL,
-  `tenure_months` int(11) NOT NULL,
-  `interest_compounded_every` smallint(5) NOT NULL DEFAULT '1',
-  `interest_compounded_every_period_enum` smallint(5) NOT NULL DEFAULT '2',
+  `tenure_months` INT NOT NULL,
+  `interest_compounded_every` SMALLINT NOT NULL DEFAULT '1',
+  `interest_compounded_every_period_enum` SMALLINT NOT NULL DEFAULT '2',
   `maturity_default_interest_rate` decimal(19,6) NOT NULL,
   `maturity_min_interest_rate` decimal(19,6) NOT NULL,
   `maturity_max_interest_rate` decimal(19,6) NOT NULL,
-  `is_compounding_interest_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `is_renewal_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `is_preclosure_allowed` tinyint(1) NOT NULL DEFAULT '0',
+  `is_compounding_interest_allowed` tinyint NOT NULL DEFAULT '0',
+  `is_renewal_allowed` tinyint NOT NULL DEFAULT '0',
+  `is_preclosure_allowed` tinyint NOT NULL DEFAULT '0',
   `pre_closure_interest_rate` decimal(19,6) NOT NULL,
-  `is_lock_in_period_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `lock_in_period` bigint(20) DEFAULT NULL,
-  `lock_in_period_type` smallint(5) NOT NULL DEFAULT '2',
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `is_lock_in_period_allowed` tinyint NOT NULL DEFAULT '0',
+  `lock_in_period` BIGINT DEFAULT NULL,
+  `lock_in_period_type` SMALLINT NOT NULL DEFAULT '2',
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name_deposit_product` (`name`),
   UNIQUE KEY `externalid_deposit_product` (`external_id`),
@@ -1302,7 +1302,7 @@ CREATE TABLE `m_product_deposit` (
   KEY `FKJPW0000000000004` (`lastmodifiedby_id`),
   CONSTRAINT `FKJPX0000000000003` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FKJPX0000000000004` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1320,33 +1320,33 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `principal_amount` decimal(19,6) NOT NULL,
   `arrearstolerance_amount` decimal(19,6) DEFAULT NULL,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
-  `fund_id` bigint(20) DEFAULT NULL,
+  `fund_id` BIGINT DEFAULT NULL,
   `nominal_interest_rate_per_period` decimal(19,6) NOT NULL,
-  `interest_period_frequency_enum` smallint(5) NOT NULL,
+  `interest_period_frequency_enum` SMALLINT NOT NULL,
   `annual_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `interest_method_enum` smallint(5) NOT NULL,
-  `interest_calculated_in_period_enum` smallint(5) NOT NULL DEFAULT '1',
-  `repay_every` smallint(5) NOT NULL,
-  `repayment_period_frequency_enum` smallint(5) NOT NULL,
-  `number_of_repayments` smallint(5) NOT NULL,
-  `amortization_method_enum` smallint(5) NOT NULL,
-  `accounting_type` smallint(5) NOT NULL,
-  `loan_transaction_strategy_id` bigint(20) DEFAULT NULL,
+  `interest_method_enum` SMALLINT NOT NULL,
+  `interest_calculated_in_period_enum` SMALLINT NOT NULL DEFAULT '1',
+  `repay_every` SMALLINT NOT NULL,
+  `repayment_period_frequency_enum` SMALLINT NOT NULL,
+  `number_of_repayments` SMALLINT NOT NULL,
+  `amortization_method_enum` SMALLINT NOT NULL,
+  `accounting_type` SMALLINT NOT NULL,
+  `loan_transaction_strategy_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FKA6A8A7D77240145` (`fund_id`),
   KEY `FK_ltp_strategy` (`loan_transaction_strategy_id`),
   CONSTRAINT `FKA6A8A7D77240145` FOREIGN KEY (`fund_id`) REFERENCES `m_fund` (`id`),
   CONSTRAINT `FK_ltp_strategy` FOREIGN KEY (`loan_transaction_strategy_id`) REFERENCES `ref_loan_transaction_processing_strategy` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1364,15 +1364,15 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_loan_charge`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_loan_charge` (
-  `product_loan_id` bigint(20) NOT NULL,
-  `charge_id` bigint(20) NOT NULL,
+  `product_loan_id` BIGINT NOT NULL,
+  `charge_id` BIGINT NOT NULL,
   PRIMARY KEY (`product_loan_id`,`charge_id`),
   KEY `charge_id` (`charge_id`),
   CONSTRAINT `m_product_loan_charge_ibfk_1` FOREIGN KEY (`charge_id`) REFERENCES `m_charge` (`id`),
   CONSTRAINT `m_product_loan_charge_ibfk_2` FOREIGN KEY (`product_loan_id`) REFERENCES `m_product_loan` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1390,40 +1390,40 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_product_savings`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_product_savings` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) DEFAULT NULL,
   `currency_code` varchar(3) DEFAULT NULL,
-  `currency_digits` smallint(5) DEFAULT NULL,
+  `currency_digits` SMALLINT DEFAULT NULL,
   `interest_rate` decimal(19,6) DEFAULT NULL,
   `min_interest_rate` decimal(19,6) DEFAULT NULL,
   `max_interest_rate` decimal(19,6) DEFAULT NULL,
   `savings_deposit_amount` decimal(19,6) NOT NULL,
-  `savings_product_type` smallint(5) DEFAULT NULL,
-  `tenure_type` smallint(5) DEFAULT NULL,
-  `deposit_every` bigint(20) DEFAULT NULL,
-  `tenure` int(11) DEFAULT NULL,
-  `frequency` int(11) DEFAULT NULL,
-  `interest_type` smallint(5) DEFAULT NULL,
-  `interest_calculation_method` smallint(5) DEFAULT NULL,
+  `savings_product_type` SMALLINT DEFAULT NULL,
+  `tenure_type` SMALLINT DEFAULT NULL,
+  `deposit_every` BIGINT DEFAULT NULL,
+  `tenure` INT DEFAULT NULL,
+  `frequency` INT DEFAULT NULL,
+  `interest_type` SMALLINT DEFAULT NULL,
+  `interest_calculation_method` SMALLINT DEFAULT NULL,
   `min_bal_for_withdrawal` decimal(19,6) NOT NULL,
-  `is_partial_deposit_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `is_lock_in_period_allowed` tinyint(1) NOT NULL DEFAULT '0',
-  `lock_in_period` bigint(20) DEFAULT NULL,
-  `lock_in_period_type` smallint(5) NOT NULL DEFAULT '1',
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `createdby_id` bigint(20) DEFAULT NULL,
+  `is_partial_deposit_allowed` tinyint NOT NULL DEFAULT '0',
+  `is_lock_in_period_allowed` tinyint NOT NULL DEFAULT '0',
+  `lock_in_period` BIGINT DEFAULT NULL,
+  `lock_in_period_type` SMALLINT NOT NULL DEFAULT '1',
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `createdby_id` BIGINT DEFAULT NULL,
   `created_date` datetime DEFAULT NULL,
   `lastmodified_date` datetime DEFAULT NULL,
-  `lastmodifiedby_id` bigint(20) DEFAULT NULL,
+  `lastmodifiedby_id` BIGINT DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `FKJPW0000000000003` (`createdby_id`),
   KEY `FKJPW0000000000004` (`lastmodifiedby_id`),
   CONSTRAINT `FKJPW0000000000003` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`),
   CONSTRAINT `FKJPW0000000000004` FOREIGN KEY (`lastmodifiedby_id`) REFERENCES `m_appuser` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1441,13 +1441,13 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL,
   `description` varchar(500) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1466,16 +1466,16 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_role_permission`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_role_permission` (
-  `role_id` bigint(20) NOT NULL,
-  `permission_id` bigint(20) NOT NULL,
+  `role_id` BIGINT NOT NULL,
+  `permission_id` BIGINT NOT NULL,
   PRIMARY KEY (`role_id`,`permission_id`),
   KEY `FK8DEDB04815CEC7AB` (`role_id`),
   KEY `FK8DEDB048103B544B` (`permission_id`),
   CONSTRAINT `FK8DEDB048103B544B` FOREIGN KEY (`permission_id`) REFERENCES `m_permission` (`id`),
   CONSTRAINT `FK8DEDB04815CEC7AB` FOREIGN KEY (`role_id`) REFERENCES `m_role` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1494,29 +1494,29 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS `m_saving_account`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
+/*!40101 SET character_set_client = UTF8MB4 */;
 CREATE TABLE `m_saving_account` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `status_enum` smallint(5) NOT NULL DEFAULT '0',
+  `id` BIGINT NOT NULL AUTO_INCREMENT,
+  `is_deleted` tinyint NOT NULL DEFAULT '0',
+  `status_enum` SMALLINT NOT NULL DEFAULT '0',
   `external_id` varchar(100) DEFAULT NULL,
-  `client_id` bigint(20) NOT NULL,
-  `product_id` bigint(20) NOT NULL,
+  `client_id` BIGINT NOT NULL,
+  `product_id` BIGINT NOT NULL,
   `deposit_amount_per_period` decimal(19,6) NOT NULL,
-  `savings_product_type` smallint(5) DEFAULT NULL,
+  `savings_product_type` SMALLINT DEFAULT NULL,
   `currency_code` varchar(3) NOT NULL,
-  `currency_digits` smallint(5) NOT NULL,
+  `currency_digits` SMALLINT NOT NULL,
   `total_deposit_amount` decimal(19,6) NOT NULL,
   `reccuring_nominal_interest_rate` decimal(19,6) NOT NULL,
   `regular_saving_nominal_interest_rate` decimal(19,6) NOT NULL,
-  `tenure` int(11) NOT NULL,
-  `tenure_type` smallint(5) DEFAULT NULL,
-  `deposit_every` bigint(20) DEFAULT NULL,
-  `frequency` int(11) DEFAULT NULL,
-  `interest_posting_every` int(11) DEFAULT NULL,
-  `interest_posting_frequency` int(11) DEFAULT NULL,
-  `interest_type` smallint(5) DEFAULT NULL,
-  `interest_calculation_method` smallint(5) DEFAULT NULL,
+  `tenure` INT NOT NULL,
+  `tenure_type` SMALLINT DEFAULT NULL,
+  `deposit_every` BIGINT DEFAULT NULL,
+  `frequency` INT DEFAULT NULL,
+  `interest_posting_every` INT DEFAULT NULL,
+  `interest_posting_frequency` INT DEFAULT NULL,
+  `interest_type` SMALLINT DEFAULT NULL,
+  `interest_calculation_method` SMALLINT DEFAULT NULL,
   `projected_commencement_date` date NOT NULL,
   `actual_commencement_date` date DEFAULT NULL,
   `matures_on_date` datetime DEFAULT NULL,
@@ -1524,29 +1524,29 @@ CREATE TABLE `m_saving_account` (
   `actual_interest_accrued` decimal(19,6) DEFAULT NULL,
   `projected_total_maturity_amount` decimal(19,6) NOT NULL,
   `actual_total_amount` decimal(19,6) DEFAULT NULL,
-  `is_preclosure_allowed` tinyint(1) NOT NULL DEFAULT '0',
+  `is_preclosure_allowed` tinyint NOT NULL DEFAULT '0',
   `pre_closure_interest_rate` decimal(19,6) NOT NULL,
   `outstanding_amount` decimal(19,6) NOT NULL,
... 18782 lines suppressed ...


Mime
View raw message