diff --git a/schema/index.html b/schema/index.html
index ce948540c8..e8c6b593c8 100644
--- a/schema/index.html
+++ b/schema/index.html
@@ -49,7 +49,7 @@
                 <section class="content-header">
                     <div class="callout callout-info">
                         <h4>SchemaSpy Analysis of default</h4>
-                        <p>Generated on Mon Sep 16 22:20 GMT 2024</p>
+                        <p>Generated on Tue Sep 17 14:13 GMT 2024</p>
                     </div>
                 </section>
                 <!-- Main content -->
diff --git a/schema/nrfc/columns.html b/schema/nrfc/columns.html
index e2792600c1..4185a30d75 100644
--- a/schema/nrfc/columns.html
+++ b/schema/nrfc/columns.html
@@ -111,32 +111,32 @@ <h3 class="box-title">Columns</h3>
                 <script>
                     var tableData = [
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "district_code",
+        "tableFileName": "district_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "email_address",
         "type": "varchar",
-        "length": 60,
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>The email address of the Natural Resource District.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "complementary_address_1",
         "type": "varchar",
-        "length": 60,
-        "nullable": "",
+        "length": 40,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>A complementary address line of a client<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -144,83 +144,111 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "business_phone_number",
+        "name": "street_address",
         "type": "varchar",
-        "length": 14,
-        "nullable": "√",
+        "length": 40,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The phone number of a client&rsquo;s specific location.<\/p>"
+        "comments": "<p>The address of a client, including the street number and street name.<\/p>"
     },
     {
-        "tableName": "submission",
-        "tableFileName": "submission",
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "postal_code",
         "type": "varchar",
-        "length": 60,
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "street_address",
-        "type": "varchar",
-        "length": 40,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The address of a client, including the street number and street name.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "fax_number",
-        "type": "varchar",
-        "length": 14,
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+    },
+    {
+        "tableName": "submission_matching_detail",
+        "tableFileName": "submission_matching_detail",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "matching_fields",
+        "type": "jsonb",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The fax number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>A JSON object provides information about matches found in the existing database. The matches can result from fuzzy search, like matching a name pattern, or from exact equality, such as matching incorporation number or good standing status.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
+        "name": "create_user",
         "type": "varchar",
         "length": 60,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
+    },
+    {
+        "tableName": "submission_contact",
+        "tableFileName": "submission_contact",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "first_name",
+        "type": "varchar",
+        "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>The first name of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "submission_location_contact_xref",
@@ -228,31 +256,31 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_contact_id",
         "type": "int4",
         "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
+        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "email_variables",
+        "type": "jsonb",
+        "length": 2147483647,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>JSONB field to store variables related to the email content.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "country_code",
+        "tableFileName": "country_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -265,64 +293,92 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "exception_message",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
+        "name": "installed_by",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Textual message describing any exceptions that occurred during email processing.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "template_name",
+        "type": "varchar",
+        "length": 40,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>Name of the email template used for sending the email.<\/p>"
     },
     {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "district_code",
+        "tableFileName": "district_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
         "name": "description",
         "type": "varchar",
-        "length": 200,
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "district_code",
+        "tableFileName": "district_code",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+    },
+    {
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email_log_id",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
         "type": "serial",
         "length": 10,
         "nullable": "",
         "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.email_log_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission email log.<\/p>"
+        "defaultValue": "nextval('nrfc.submission_location_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+    },
+    {
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -335,92 +391,50 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "good_standing_ind",
+        "type": "varchar",
+        "length": 1,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>An indicator that determines whether a client is in good standing with respect to their financial obligations.<\/p>"
     },
     {
-        "tableName": "submission",
-        "tableFileName": "submission",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "submission_date",
+        "name": "update_timestamp",
         "type": "timestamp",
         "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>Timestamp indicating when the email log entry was last updated.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "business_type_code",
+        "tableFileName": "business_type_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_type_code",
-        "type": "varchar",
-        "length": 4,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code indicating the identification type of a client. Examples of possible ID types include Canadian Birth Certificate, Canadian Passport, and others.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the country to which the ID type belongs. If the country code is populated, a province or state will be required.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
-        "type": "varchar",
-        "length": 1,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Email address to which the email is sent.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "business_type_code",
+        "tableFileName": "business_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -433,18 +447,18 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
+        "tableName": "province_code",
+        "tableFileName": "province_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -452,69 +466,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "complementary_address_2",
+        "name": "location_name",
         "type": "varchar",
         "length": 40,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A second complementary address line of a client<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
+        "comments": "<p>The location name of an address. Examples of location names include, but are not limited to, Mailing Address, Billing Address among others.<\/p>"
     },
     {
         "tableName": "submission",
         "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "country_code",
         "tableFileName": "country_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>display_order",
+        "type": "int4",
+        "length": 10,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
+        "comments": "<p>The the display order of a country. If no value is provided, the application will order countries alphabetically by default.<\/p>"
     },
     {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
         "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_type_code",
         "type": "varchar",
         "length": 4,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code indicating the identification type of a client.<\/p>"
+        "comments": "<p>A code indicating the identification type of a client. Examples of possible ID types include Canadian Birth Certificate, Canadian Passport, and others.<\/p>"
     },
     {
         "tableName": "country_code",
@@ -522,24 +522,24 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
         "tableFileName": "flyway_schema_history",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "checksum",
-        "type": "int4",
-        "length": 10,
-        "nullable": "√",
+        "keyClass": "indexedColumn",
+        "keyTitle": "Indexed",
+        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>success",
+        "type": "bool",
+        "length": 1,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
@@ -548,15 +548,15 @@ <h3 class="box-title">Columns</h3>
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "notes",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_province_code",
         "type": "varchar",
-        "length": 4000,
+        "length": 4,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Any additional information about the client or specific instructions.<\/p>"
+        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
     },
     {
         "tableName": "client_type_code",
@@ -564,83 +564,69 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_timestamp",
+        "name": "update_timestamp",
         "type": "timestamp",
         "length": 29,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "contact_type_code",
         "tableFileName": "contact_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
         "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "length": 2,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
+        "tableName": "country_code",
+        "tableFileName": "country_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confirmed_match_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The timestamp when the changes happened.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
         "tableFileName": "flyway_schema_history",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "script",
-        "type": "varchar",
-        "length": 1000,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>installed_rank",
+        "type": "int4",
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
         "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>display_order",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "execution_time",
         "type": "int4",
         "length": 10,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The the display order of a country. If no value is provided, the application will order countries alphabetically by default.<\/p>"
+        "comments": ""
     },
     {
         "tableName": "country_code",
@@ -648,97 +634,97 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_name",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_type_code",
         "type": "varchar",
-        "length": 30,
+        "length": 4,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The first name of the client.<\/p>"
+        "comments": "<p>A code indicating the identification type of a client.<\/p>"
     },
     {
         "tableName": "submission_contact",
         "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "email_address",
         "type": "varchar",
-        "length": 2,
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
+        "comments": "<p>The email address of the client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "email_id",
         "type": "varchar",
-        "length": 60,
-        "nullable": "",
+        "length": 40,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>Identifier for the associated email assigned by CHES (if applicable).<\/p>"
     },
     {
         "tableName": "province_code",
         "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the country in which the province is located.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_status_code",
         "tableFileName": "submission_status_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_status_code",
-        "type": "varchar",
-        "length": 5,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the status of a submission request.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "execution_time",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_type_code",
+        "type": "varchar",
+        "length": 5,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>A code indicating the status of a submission request. Examples include, but are not limited to: New, Approved, Rejected, and others.<\/p>"
     },
     {
         "tableName": "submission_contact",
@@ -746,69 +732,69 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "last_name",
+        "name": "secondary_phone_number",
         "type": "varchar",
-        "length": 30,
+        "length": 14,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The last name of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>A secondary phone number of the client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_subject",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_type_code",
         "type": "varchar",
-        "length": 100,
+        "length": 5,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Subject of the email.<\/p>"
+        "comments": "<p>A code representing the type of a submission request.<\/p>"
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "province_code",
+        "tableFileName": "province_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "√",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s location.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
         "tableName": "contact_type_code",
         "tableFileName": "contact_type_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
-        "type": "varchar",
-        "length": 2,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
-        "type": "serial",
-        "length": 10,
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
+        "type": "varchar",
+        "length": 2,
         "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_location_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -816,27 +802,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "work_safe_bc_number",
+        "name": "middle_name",
         "type": "varchar",
-        "length": 6,
+        "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A Work Safe BC number of a client.<\/p>"
+        "comments": "<p>The middle name of the client.<\/p>"
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "submission_contact",
+        "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_contact_id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.submission_contact_seq'::regclass)",
+        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -844,13 +830,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "country_code",
@@ -858,69 +844,69 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "business_type_code",
+        "tableFileName": "business_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
+        "type": "varchar",
+        "length": 1,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>A code indicating the business type of a client.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "district_code",
+        "tableFileName": "district_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
+        "type": "varchar",
+        "length": 5,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>A code representing the code of a Natural Resource District.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_name",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_country_code",
         "type": "varchar",
-        "length": 30,
+        "length": 2,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The last name of the client.<\/p>"
+        "comments": "<p>A code representing the code of a country.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "submission_matching_detail",
+        "tableFileName": "submission_matching_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_matching_detail_id",
+        "type": "serial",
+        "length": 10,
         "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.submission_matching_detail_id_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a submission matching detail of a client.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -928,13 +914,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_sent_ind",
+        "name": "email_subject",
         "type": "varchar",
-        "length": 1,
-        "nullable": "√",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Indicator for whether the email has been sent (&lsquo;Y&rsquo; for Yes, &lsquo;N&rsquo; for No).<\/p>"
+        "comments": "<p>Subject of the email.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -942,13 +928,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_id",
+        "name": "email_address",
         "type": "varchar",
-        "length": 40,
-        "nullable": "√",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Identifier for the associated email assigned by CHES (if applicable).<\/p>"
+        "comments": "<p>Email address to which the email is sent.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -956,27 +942,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "postal_code",
+        "name": "fax_number",
         "type": "varchar",
-        "length": 10,
-        "nullable": "",
+        "length": 14,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>The fax number of a client&rsquo;s specific location.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -984,27 +970,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "matching_fields",
-        "type": "jsonb",
-        "length": 2147483647,
+        "name": "confirmed_match_userid",
+        "type": "varchar",
+        "length": 60,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A JSON object provides information about matches found in the existing database. The matches can result from fuzzy search, like matching a name pattern, or from exact equality, such as matching incorporation number or good standing status.<\/p>"
+        "comments": "<p>The ID of the user submitting the changes.<\/p>"
     },
     {
         "tableName": "client_type_code",
         "tableFileName": "client_type_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
-        "type": "varchar",
-        "length": 5,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the type of a client.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "contact_type_code",
@@ -1012,41 +998,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "contact_type_code",
+        "tableFileName": "contact_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
         "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "length": 1,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1054,13 +1040,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_type_code",
@@ -1068,55 +1054,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
+        "tableName": "country_code",
+        "tableFileName": "country_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>success",
-        "type": "bool",
-        "length": 1,
-        "nullable": "",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "submission_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -1124,13 +1110,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "template_name",
-        "type": "varchar",
-        "length": 40,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Name of the email template used for sending the email.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>Timestamp indicating when the email log entry was created.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1138,13 +1124,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "province_code",
@@ -1152,27 +1138,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_detail_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_detail_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission detail of a client.<\/p>"
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "incorporation_number",
+        "type": "varchar",
+        "length": 13,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1180,31 +1166,31 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "doing_business_as",
+        "name": "last_name",
         "type": "varchar",
-        "length": 120,
+        "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>An alternate name that a client may be conducting business under. For example: John Smith doing business as: John&rsquo;s Logging.<\/p>"
+        "comments": "<p>The last name of the client.<\/p>"
     },
     {
         "tableName": "country_code",
         "tableFileName": "country_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
         "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "length": 2,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>A code representing the code of a country.<\/p>"
     },
     {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -1217,32 +1203,18 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_type_code",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the type of a submission request.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "district_code",
+        "tableFileName": "district_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1250,27 +1222,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "incorporation_number",
-        "type": "varchar",
+        "name": "birthdate",
+        "type": "date",
         "length": 13,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process.<\/p>"
+        "comments": "<p>The date that the BC Services Card logged in person was born.<\/p>"
     },
     {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "idp_user_id",
+        "name": "description",
         "type": "varchar",
-        "length": 50,
-        "nullable": "√",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The unique identifier assigned to a user by the Identity Provider.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -1278,27 +1250,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "province_code",
+        "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "complementary_address_1",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
         "type": "varchar",
-        "length": 40,
-        "nullable": "√",
+        "length": 2,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A complementary address line of a client<\/p>"
+        "comments": "<p>A code representing the country in which the province is located.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1306,13 +1278,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -1320,55 +1292,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confirmed_match_status_ind",
-        "type": "varchar",
+        "name": "submission_matching_processed",
+        "type": "bool",
         "length": 1,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>An indicator that determines whether a specific match has been approved, allowing the processing to continue, or denied, requiring immediate action to be taken during the submission process.<\/p>"
+        "defaultValue": "false",
+        "comments": "<p>A flag to indicate that the submission was finally processed.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "submission_location_contact_xref",
+        "tableFileName": "submission_location_contact_xref",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
+        "type": "int4",
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
     },
     {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "installed_on",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_status_code",
+        "type": "varchar",
+        "length": 5,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
+        "defaultValue": "null",
+        "comments": "<p>TBD.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_variables",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>JSONB field to store variables related to the email content.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -1376,27 +1348,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confirmed_match_message",
-        "type": "varchar",
-        "length": 1000,
+        "name": "submission_matching_processed_time",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A field with the reason for the denial of the submission.<\/p>"
+        "comments": "<p>The timestamp of when the processor started to process this specific entry<\/p>"
     },
     {
         "tableName": "submission",
         "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_status_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_user",
         "type": "varchar",
-        "length": 5,
-        "nullable": "√",
+        "length": 60,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>TBD.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -1404,13 +1376,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_contact",
@@ -1418,97 +1390,97 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "first_name",
+        "name": "idp_user_id",
         "type": "varchar",
-        "length": 30,
+        "length": 50,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The first name of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The unique identifier assigned to a user by the Identity Provider.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "work_safe_bc_number",
+        "type": "varchar",
+        "length": 6,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>A Work Safe BC number of a client.<\/p>"
+    },
+    {
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
+        "tableType": "Table",
         "keyClass": "foreignKey",
         "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
         "type": "varchar",
-        "length": 5,
+        "length": 2,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the type of a client.<\/p>"
+        "comments": "<p>A code representing the code of a country.<\/p>"
     },
     {
-        "tableName": "submission",
-        "tableFileName": "submission",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
         "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "length": 5,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>A code representing the type of a client.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "description",
+        "type": "varchar",
+        "length": 200,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": ""
     },
     {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "submission_matching_processed",
-        "type": "bool",
-        "length": 1,
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "false",
-        "comments": "<p>A flag to indicate that the submission was finally processed.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_province_code",
-        "type": "varchar",
-        "length": 4,
-        "nullable": "√",
-        "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "business_type_code",
+        "tableFileName": "business_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1516,27 +1488,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "middle_name",
+        "name": "client_identification",
         "type": "varchar",
-        "length": 30,
+        "length": 40,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The middle name of the client.<\/p>"
+        "comments": "<p>The reference number that identifies a client.<\/p>"
     },
     {
-        "tableName": "submission_location_contact_xref",
-        "tableFileName": "submission_location_contact_xref",
+        "tableName": "submission_matching_detail",
+        "tableFileName": "submission_matching_detail",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_contact_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "confirmed_match_status_ind",
+        "type": "varchar",
+        "length": 1,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
+        "comments": "<p>An indicator that determines whether a specific match has been approved, allowing the processing to continue, or denied, requiring immediate action to be taken during the submission process.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -1544,13 +1516,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "secondary_phone_number",
+        "name": "complementary_address_2",
         "type": "varchar",
-        "length": 14,
+        "length": 40,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A secondary phone number of a client&rsquo;s specific location.<\/p>"
+        "comments": "<p>A second complementary address line of a client<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -1558,13 +1530,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "fax_number",
+        "name": "email_address",
         "type": "varchar",
-        "length": 14,
+        "length": 100,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The fax number of a client&rsquo;s specific location.<\/p>"
+        "comments": "<p>The email address of the client&rsquo;s location.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -1572,27 +1544,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "submission_matching_processed_time",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "type",
+        "type": "varchar",
+        "length": 20,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The timestamp of when the processor started to process this specific entry<\/p>"
+        "comments": ""
     },
     {
         "tableName": "flyway_schema_history",
@@ -1600,41 +1572,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "version",
-        "type": "varchar",
-        "length": 50,
+        "name": "checksum",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "province_code",
+        "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "notes",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
         "type": "varchar",
-        "length": 4000,
-        "nullable": "√",
+        "length": 4,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Any additional information about the client&rsquo;s location or specific instructions for contacting them.<\/p>"
+        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
     },
     {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1642,13 +1614,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
@@ -1656,181 +1628,195 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "type",
-        "type": "varchar",
-        "length": 20,
+        "name": "installed_on",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
+        "defaultValue": "now()",
         "comments": ""
     },
+    {
+        "tableName": "submission_contact",
+        "tableFileName": "submission_contact",
+        "tableType": "Table",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+    },
     {
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "location_name",
+        "name": "notes",
         "type": "varchar",
-        "length": 40,
-        "nullable": "",
+        "length": 4000,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The location name of an address. Examples of location names include, but are not limited to, Mailing Address, Billing Address among others.<\/p>"
+        "comments": "<p>Any additional information about the client&rsquo;s location or specific instructions for contacting them.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
         "tableFileName": "submission_matching_detail",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_matching_detail_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_matching_detail_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission matching detail of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "client_identification",
+        "name": "confirmed_match_message",
         "type": "varchar",
-        "length": 40,
+        "length": 1000,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The reference number that identifies a client.<\/p>"
+        "comments": "<p>A field with the reason for the denial of the submission.<\/p>"
     },
     {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "country_code",
+        "tableFileName": "country_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
+        "name": "description",
         "type": "varchar",
         "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
+    },
+    {
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_status_code",
+        "type": "varchar",
+        "length": 5,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>A code representing the status of a submission request.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "organization_name",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
         "type": "varchar",
-        "length": 60,
+        "length": 5,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The name of the client.<\/p>"
+        "comments": "<p>A code representing the natural resource district of a client.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "submission_matching_detail",
+        "tableFileName": "submission_matching_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
-        "tableName": "submission",
-        "tableFileName": "submission",
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "display_order",
-        "type": "int4",
-        "length": 10,
+        "name": "exception_message",
+        "type": "text",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The the display order of a province/state. If no value is provided, the application will order provinces/states alphabetically by default.<\/p>"
+        "comments": "<p>Textual message describing any exceptions that occurred during email processing.<\/p>"
     },
     {
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "business_phone_number",
         "type": "varchar",
-        "length": 2,
-        "nullable": "",
+        "length": 14,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "comments": "<p>The phone number of a client&rsquo;s specific location.<\/p>"
     },
     {
         "tableName": "province_code",
         "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
-        "type": "varchar",
-        "length": 4,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1838,27 +1824,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "client_number",
         "type": "varchar",
-        "length": 60,
-        "nullable": "",
+        "length": 8,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": ""
     },
     {
         "tableName": "province_code",
@@ -1866,27 +1852,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
+        "name": "display_order",
+        "type": "int4",
+        "length": 10,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The the display order of a province/state. If no value is provided, the application will order provinces/states alphabetically by default.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "organization_name",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "comments": "<p>The name of the client.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1894,27 +1880,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The email address of the Natural Resource District.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confirmed_match_userid",
+        "name": "version",
         "type": "varchar",
-        "length": 60,
+        "length": 50,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The ID of the user submitting the changes.<\/p>"
+        "comments": ""
     },
     {
         "tableName": "submission_detail",
@@ -1922,13 +1908,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "good_standing_ind",
+        "name": "doing_business_as",
         "type": "varchar",
-        "length": 1,
+        "length": 120,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>An indicator that determines whether a client is in good standing with respect to their financial obligations.<\/p>"
+        "comments": "<p>An alternate name that a client may be conducting business under. For example: John Smith doing business as: John&rsquo;s Logging.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1936,83 +1922,83 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "birthdate",
-        "type": "date",
-        "length": 13,
+        "name": "client_acronym",
+        "type": "varchar",
+        "length": 8,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the BC Services Card logged in person was born.<\/p>"
+        "comments": "<p>A familiar alphabetic acronym to be used as an alternative to the ministry&rsquo;s client number for data entry and display.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "contact_type_code",
+        "tableFileName": "contact_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
         "tableName": "submission_contact",
         "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_contact_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_contact_seq'::regclass)",
-        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "last_name",
+        "type": "varchar",
+        "length": 30,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The last name of the client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "foreignKey",
         "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_country_code",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
         "type": "varchar",
         "length": 2,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
+        "comments": "<p>A code representing the country to which the ID type belongs. If the country code is populated, a province or state will be required.<\/p>"
     },
     {
         "tableName": "submission_contact",
         "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "business_phone_number",
+        "type": "varchar",
+        "length": 14,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "comments": "<p>The phone number of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "business_type_code",
         "tableFileName": "business_type_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
-        "type": "varchar",
-        "length": 1,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code indicating the business type of a client.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "province_code",
@@ -2020,13 +2006,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_contact",
@@ -2034,41 +2020,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "business_phone_number",
+        "name": "fax_number",
         "type": "varchar",
         "length": 14,
-        "nullable": "",
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The phone number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The fax number of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "district_code",
         "tableFileName": "district_code",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
-        "type": "varchar",
-        "length": 5,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a Natural Resource District.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "first_name",
         "type": "varchar",
-        "length": 5,
+        "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the natural resource district of a client.<\/p>"
+        "comments": "<p>The first name of the client.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -2076,37 +2062,37 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "city_name",
+        "name": "secondary_phone_number",
         "type": "varchar",
-        "length": 30,
-        "nullable": "",
+        "length": 14,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The name of the city of the location.<\/p>"
+        "comments": "<p>A secondary phone number of a client&rsquo;s specific location.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "client_number",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
         "type": "varchar",
-        "length": 8,
-        "nullable": "√",
+        "length": 5,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>A code representing the type of a client.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
         "tableFileName": "flyway_schema_history",
         "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>installed_rank",
-        "type": "int4",
-        "length": 10,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "script",
+        "type": "varchar",
+        "length": 1000,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2116,57 +2102,43 @@ <h3 class="box-title">Columns</h3>
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "secondary_phone_number",
+        "name": "city_name",
         "type": "varchar",
-        "length": 14,
-        "nullable": "√",
+        "length": 30,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A secondary phone number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The name of the city of the location.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "contact_type_code",
+        "tableFileName": "contact_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -2174,27 +2146,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_detail_id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.submission_detail_id_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a submission detail of a client.<\/p>"
+    },
+    {
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
+        "name": "email_sent_ind",
         "type": "varchar",
-        "length": 60,
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "comments": "<p>Indicator for whether the email has been sent (&lsquo;Y&rsquo; for Yes, &lsquo;N&rsquo; for No).<\/p>"
     },
     {
         "tableName": "province_code",
@@ -2202,13 +2188,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "client_type_code",
@@ -2216,13 +2202,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "contact_type_code",
@@ -2230,27 +2216,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "submission",
         "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "update_user",
         "type": "varchar",
-        "length": 5,
+        "length": 60,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code indicating the status of a submission request. Examples include, but are not limited to: New, Approved, Rejected, and others.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_type_code",
@@ -2258,27 +2244,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
         "tableFileName": "submission_matching_detail",
         "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "confirmed_match_timestamp",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The timestamp when the changes happened.<\/p>"
+    },
+    {
+        "tableName": "submission_contact",
+        "tableFileName": "submission_contact",
+        "tableType": "Table",
         "keyClass": "foreignKey",
         "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
+        "type": "varchar",
+        "length": 2,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "submission_type_code",
@@ -2286,27 +2286,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the code value has become or is expected to become effective. Default is the data that the code value is created.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "installed_by",
-        "type": "varchar",
-        "length": 100,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "serial",
+        "length": 10,
         "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.submission_id_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -2314,13 +2314,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "client_acronym",
+        "name": "notes",
         "type": "varchar",
-        "length": 8,
+        "length": 4000,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A familiar alphabetic acronym to be used as an alternative to the ministry&rsquo;s client number for data entry and display.<\/p>"
+        "comments": "<p>Any additional information about the client or specific instructions.<\/p>"
     },
     {
         "tableName": "contact_type_code",
@@ -2328,41 +2328,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
-        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "email_log",
         "tableFileName": "email_log",
         "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email_log_id",
+        "type": "serial",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.email_log_id_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a submission email log.<\/p>"
+    },
+    {
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
+        "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
+        "name": "expiry_date",
+        "type": "date",
+        "length": 13,
+        "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was last updated.<\/p>"
+        "defaultValue": "to_date('99991231'::text, 'YYYYMMDD'::text)",
+        "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     }
 ];
                     var config = {
diff --git a/schema/nrfc/default.nrfc.xml b/schema/nrfc/default.nrfc.xml
index 24de6a181e..e703009a11 100644
--- a/schema/nrfc/default.nrfc.xml
+++ b/schema/nrfc/default.nrfc.xml
@@ -268,8 +268,8 @@
          </column>
          <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="street_address" nullable="false" remarks="The address of a client, including the street number and street name." size="40" type="varchar" typeCode="12"/>
          <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="country_code" nullable="false" remarks="A code representing the code of a country." size="2" type="varchar" typeCode="12">
-            <parent column="country_code" foreignKey="submission_location_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="country_code"/>
             <parent column="country_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
+            <parent column="country_code" foreignKey="submission_location_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="country_code"/>
          </column>
          <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="province_code" nullable="false" remarks="A code representing the code of a province, state, department or territory." size="2" type="varchar" typeCode="12">
             <parent column="province_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
diff --git a/schema/nrfc/index.html b/schema/nrfc/index.html
index 1e6286f670..21b4100f61 100644
--- a/schema/nrfc/index.html
+++ b/schema/nrfc/index.html
@@ -78,7 +78,7 @@ <h1>Tables</h1><br />
                         <div class="col-md-12">
                             <div class="callout callout-info">
                                 <h4>SchemaSpy Analysis of default.nrfc</h4>
-                                <p>Generated on Mon Sep 16 22:20 GMT 2024</p>
+                                <p>Generated on Tue Sep 17 14:13 GMT 2024</p>
                             </div>
                         </div>
                     </div>
diff --git a/schema/nrfc/info-html.txt b/schema/nrfc/info-html.txt
index cc4b053387..63776f2b52 100644
--- a/schema/nrfc/info-html.txt
+++ b/schema/nrfc/info-html.txt
@@ -1,5 +1,5 @@
-date=2024-09-16 22:20:39+0000
-os=Linux 6.8.0-1014-azure
+date=2024-09-17 14:13:34+0000
+os=Linux 6.5.0-1025-azure
 schemaspy-version=6.2.4
 schemaspy-build=6.2.4.41 2023-07-21 11:15:12
 renderer=Graphviz dot 2.47.1 
diff --git a/schema/nrfc/tables/submission_location.html b/schema/nrfc/tables/submission_location.html
index caf708be8d..d64dab2c17 100644
--- a/schema/nrfc/tables/submission_location.html
+++ b/schema/nrfc/tables/submission_location.html
@@ -196,13 +196,13 @@ <h3 id="Columns" class="box-title">Columns</h3>
                                     <td>
                                         <table border='0' cellspacing='0' cellpadding='0'>
                                             <tr>
-                                                <td title="submission_location.country_code references country_code.country_code via submission_location_country_code_fk"><a href='country_code.html'>country_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_country_code_fk</td>
+                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.country_code</span></td>
+                                                <td class="constraint detail">submission_location_province_code_fk</td>
                                                 <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
                                             </tr>
                                             <tr>
-                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_province_code_fk</td>
+                                                <td title="submission_location.country_code references country_code.country_code via submission_location_country_code_fk"><a href='country_code.html'>country_code</a><span class='relatedKey'>.country_code</span></td>
+                                                <td class="constraint detail">submission_location_country_code_fk</td>
                                                 <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
                                             </tr>
                                         </table>