diff --git a/schema/index.html b/schema/index.html
index e44da718a8..039adc3982 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 23 21:51 GMT 2024</p>
+                        <p>Generated on Tue Sep 24 21:27 GMT 2024</p>
                     </div>
                 </section>
                 <!-- Main content -->
diff --git a/schema/nrfc/columns.html b/schema/nrfc/columns.html
index c28286eeef..5ee360eb76 100644
--- a/schema/nrfc/columns.html
+++ b/schema/nrfc/columns.html
@@ -111,18 +111,32 @@ <h3 class="box-title">Columns</h3>
                 <script>
                     var tableData = [
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "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>district_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_user",
         "type": "varchar",
-        "length": 5,
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a Natural Resource District.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
+    },
+    {
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "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_location",
@@ -130,41 +144,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "fax_number",
+        "name": "business_phone_number",
         "type": "varchar",
         "length": 14,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The fax number of a client&rsquo;s specific location.<\/p>"
+        "comments": "<p>The phone number of a client&rsquo;s specific location.<\/p>"
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "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": "",
+        "keyTitle": "",
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "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>The user or proxy account that created the record.<\/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": "street_address",
         "type": "varchar",
-        "length": 2,
+        "length": 40,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "comments": "<p>The address of a client, including the street number and street name.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -172,41 +186,41 @@ <h3 class="box-title">Columns</h3>
         "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_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "submission_contact",
+        "tableFileName": "submission_contact",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "fax_number",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 14,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The fax number of the client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "update_user",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -228,27 +242,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/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": "effective_date",
+        "type": "date",
+        "length": 13,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/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": "client_type_code",
@@ -256,13 +256,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -270,27 +270,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "name": "exception_message",
+        "type": "text",
+        "length": 2147483647,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Email address to which the email is sent.<\/p>"
+        "comments": "<p>Textual message describing any exceptions that occurred during email processing.<\/p>"
     },
     {
         "tableName": "country_code",
         "tableFileName": "country_code",
         "tableType": "Table",
-        "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": "√",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
+        "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": "<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",
@@ -298,9 +298,9 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "script",
+        "name": "description",
         "type": "varchar",
-        "length": 1000,
+        "length": 200,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -310,15 +310,15 @@ <h3 class="box-title">Columns</h3>
         "tableName": "email_log",
         "tableFileName": "email_log",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_sent_ind",
-        "type": "varchar",
-        "length": 1,
-        "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>"
+        "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",
@@ -326,13 +326,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -340,13 +340,13 @@ <h3 class="box-title">Columns</h3>
         "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": "submission",
@@ -354,13 +354,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "submission_date",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The date and time the record was created.<\/p>"
+    },
+    {
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_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": 60,
+        "length": 4,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/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": "identification_type_code",
@@ -376,33 +390,19 @@ <h3 class="box-title">Columns</h3>
         "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": "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": "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>business_type_code",
         "type": "varchar",
-        "length": 60,
-        "nullable": "√",
+        "length": 1,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The name of the client.<\/p>"
+        "comments": "<p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -410,27 +410,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_variables",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
+        "name": "email_address",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>JSONB field to store variables related to the email content.<\/p>"
+        "comments": "<p>Email address to which the email is sent.<\/p>"
     },
     {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
+        "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>business_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_user",
         "type": "varchar",
-        "length": 1,
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code indicating the business type of a client.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -438,69 +438,69 @@ <h3 class="box-title">Columns</h3>
         "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>The date and time the record 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": "province_code",
-        "tableFileName": "province_code",
+        "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>province_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "complementary_address_2",
         "type": "varchar",
-        "length": 4,
-        "nullable": "",
+        "length": 40,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "comments": "<p>A second complementary address line of a client<\/p>"
     },
     {
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city_name",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
         "type": "varchar",
-        "length": 30,
+        "length": 2,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The name of the city of the location.<\/p>"
+        "comments": "<p>A code representing the code of a country.<\/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",
-        "type": "varchar",
-        "length": 5,
-        "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>"
+        "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>"
     },
     {
         "tableName": "country_code",
         "tableFileName": "country_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary 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>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>A code representing the code of a country.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -508,13 +508,13 @@ <h3 class="box-title">Columns</h3>
         "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>identification_type_code",
         "type": "varchar",
-        "length": 2,
+        "length": 4,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
+        "comments": "<p>A code indicating the identification type of a client.<\/p>"
     },
     {
         "tableName": "country_code",
@@ -522,13 +522,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "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 description of the code value.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
@@ -536,12 +536,12 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "installed_on",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
+        "name": "checksum",
+        "type": "int4",
+        "length": 10,
+        "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "now()",
+        "defaultValue": "null",
         "comments": ""
     },
     {
@@ -550,13 +550,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "client_identification",
+        "name": "notes",
         "type": "varchar",
-        "length": 40,
+        "length": 4000,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The reference number that identifies a client.<\/p>"
+        "comments": "<p>Any additional information about the client or specific instructions.<\/p>"
     },
     {
         "tableName": "client_type_code",
@@ -564,13 +564,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "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 description of the code value.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -578,27 +578,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "contact_type_code",
+        "tableFileName": "contact_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "update_user",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -620,9 +620,9 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "installed_by",
+        "name": "script",
         "type": "varchar",
-        "length": 100,
+        "length": 1000,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -632,15 +632,15 @@ <h3 class="box-title">Columns</h3>
         "tableName": "country_code",
         "tableFileName": "country_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "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": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "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>"
     },
     {
         "tableName": "country_code",
@@ -648,13 +648,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -662,27 +662,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "last_name",
+        "name": "first_name",
         "type": "varchar",
         "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The last name of the client.<\/p>"
+        "comments": "<p>The first name of the client.<\/p>"
     },
     {
         "tableName": "submission_contact",
         "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_name",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
         "type": "varchar",
-        "length": 30,
-        "nullable": "√",
+        "length": 2,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The last name of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "province_code",
@@ -690,55 +690,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "display_order",
-        "type": "int4",
-        "length": 10,
-        "nullable": "√",
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
+        "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>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "province_code",
         "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary 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>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>A code representing the country in which the province is located.<\/p>"
     },
     {
         "tableName": "submission_status_code",
         "tableFileName": "submission_status_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "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>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>A code representing the status of a submission request.<\/p>"
     },
     {
-        "tableName": "submission",
-        "tableFileName": "submission",
+        "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>submission_id",
-        "type": "serial",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "execution_time",
+        "type": "int4",
         "length": 10,
         "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
     },
     {
         "tableName": "submission_contact",
@@ -746,13 +746,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
+        "name": "last_name",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 30,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The last name of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "email_log",
@@ -760,55 +760,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "email_subject",
+        "type": "varchar",
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was created.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>Subject of the email.<\/p>"
     },
     {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
+        "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>country_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "email_address",
         "type": "varchar",
-        "length": 2,
-        "nullable": "",
+        "length": 100,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the country in which the province is located.<\/p>"
+        "comments": "<p>The email address of the client&rsquo;s location.<\/p>"
     },
     {
         "tableName": "contact_type_code",
         "tableFileName": "contact_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "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>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>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "submission_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "street_address",
-        "type": "varchar",
-        "length": 40,
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
+        "type": "serial",
+        "length": 10,
         "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The address of a client, including the street number and street name.<\/p>"
+        "autoUpdated": "√",
+        "defaultValue": "nextval('nrfc.submission_location_seq'::regclass)",
+        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -816,13 +816,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "client_acronym",
+        "name": "work_safe_bc_number",
         "type": "varchar",
-        "length": 8,
+        "length": 6,
         "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>A Work Safe BC number of a client.<\/p>"
     },
     {
         "tableName": "country_code",
@@ -830,13 +830,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -844,6 +844,34 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
+        "name": "effective_date",
+        "type": "date",
+        "length": 13,
+        "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>"
+    },
+    {
+        "tableName": "country_code",
+        "tableFileName": "country_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": "district_code",
+        "tableFileName": "district_code",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
         "name": "create_timestamp",
         "type": "timestamp",
         "length": 29,
@@ -853,8 +881,8 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -867,22 +895,22 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
+        "name": "last_name",
         "type": "varchar",
-        "length": 60,
-        "nullable": "",
+        "length": 30,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "comments": "<p>The last name of the client.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "client_type_code",
+        "tableFileName": "client_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -895,74 +923,74 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "email_sent_ind",
         "type": "varchar",
-        "length": 4,
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code indicating the identification type of a client.<\/p>"
+        "comments": "<p>Indicator for whether the email has been sent (&lsquo;Y&rsquo; for Yes, &lsquo;N&rsquo; for No).<\/p>"
     },
     {
-        "tableName": "submission_location_contact_xref",
-        "tableFileName": "submission_location_contact_xref",
+        "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>submission_location_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "email_id",
+        "type": "varchar",
+        "length": 40,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
+        "comments": "<p>Identifier for the associated email assigned by CHES (if applicable).<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "submission_location",
+        "tableFileName": "submission_location",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "template_name",
+        "name": "postal_code",
         "type": "varchar",
-        "length": 40,
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Name of the email template used for sending the email.<\/p>"
+        "comments": ""
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "exception_message",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Textual message describing any exceptions that occurred during email processing.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "submission_matching_detail",
+        "tableFileName": "submission_matching_detail",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "business_phone_number",
+        "name": "confirmed_match_message",
         "type": "varchar",
-        "length": 14,
+        "length": 1000,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The phone number of a client&rsquo;s specific location.<\/p>"
+        "comments": "<p>A field with the reason for the denial of the submission.<\/p>"
     },
     {
         "tableName": "client_type_code",
@@ -979,78 +1007,64 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>A code representing the type of a client.<\/p>"
     },
     {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
+        "tableName": "contact_type_code",
+        "tableFileName": "contact_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "confirmed_match_message",
+        "name": "description",
         "type": "varchar",
-        "length": 1000,
-        "nullable": "√",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A field with the reason for the denial of the submission.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "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": "contact_type_code",
-        "tableFileName": "contact_type_code",
+        "tableName": "business_type_code",
+        "tableFileName": "business_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": "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",
+        "name": "update_user",
         "type": "varchar",
-        "length": 2,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
+        "tableName": "submission_status_code",
+        "tableFileName": "submission_status_code",
         "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": "description",
+        "type": "varchar",
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "comments": "<p>The description of the code value.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
@@ -1063,60 +1077,46 @@ <h3 class="box-title">Columns</h3>
         "comments": "<p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
+        "name": "create_timestamp",
         "type": "timestamp",
         "length": 29,
-        "nullable": "√",
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "comments": "<p>Timestamp indicating when the email log entry was created.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "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>submission_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_user",
         "type": "varchar",
-        "length": 5,
+        "length": 60,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the type of a submission request.<\/p>"
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
+        "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>country_code",
-        "type": "varchar",
-        "length": 2,
+        "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": "<p>A code representing the code of a country.<\/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",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>TBD.<\/p>"
+        "comments": ""
     },
     {
         "tableName": "email_log",
@@ -1124,13 +1124,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_subject",
+        "name": "template_name",
         "type": "varchar",
-        "length": 100,
+        "length": 40,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Subject of the email.<\/p>"
+        "comments": "<p>Name of the email template used for sending the email.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1138,13 +1138,13 @@ <h3 class="box-title">Columns</h3>
         "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": "province_code",
@@ -1152,13 +1152,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "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 description of the code value.<\/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>"
     },
     {
         "tableName": "submission_detail",
@@ -1166,27 +1180,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "client_number",
+        "name": "doing_business_as",
         "type": "varchar",
-        "length": 8,
+        "length": 120,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "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",
-        "tableFileName": "submission_detail",
+        "tableName": "country_code",
+        "tableFileName": "country_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "first_name",
+        "name": "update_user",
         "type": "varchar",
-        "length": 30,
+        "length": 60,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The first name of the client.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "contact_type_code",
@@ -1194,55 +1208,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_type_code",
         "tableFileName": "submission_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "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>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>A code representing the type of a submission request.<\/p>"
     },
     {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
+        "tableName": "submission_type_code",
+        "tableFileName": "submission_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "update_user",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/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>client_type_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "incorporation_number",
         "type": "varchar",
-        "length": 5,
-        "nullable": "",
+        "length": 13,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the type of a client.<\/p>"
+        "comments": "<p>A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process.<\/p>"
     },
     {
         "tableName": "submission_contact",
@@ -1250,13 +1264,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "fax_number",
+        "name": "idp_user_id",
         "type": "varchar",
-        "length": 14,
+        "length": 50,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The fax number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The unique identifier assigned to a user by the Identity Provider.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -1264,13 +1278,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "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 description of the code value.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -1278,13 +1292,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_address",
+        "name": "complementary_address_1",
         "type": "varchar",
-        "length": 100,
+        "length": 40,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s location.<\/p>"
+        "comments": "<p>A complementary address line of a client<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1292,13 +1306,13 @@ <h3 class="box-title">Columns</h3>
         "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_matching_detail",
@@ -1320,26 +1334,26 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/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": "indexedColumn",
-        "keyTitle": "Indexed",
-        "name": "<i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'><\/i>success",
-        "type": "bool",
-        "length": 1,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "installed_on",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
+        "defaultValue": "now()",
         "comments": ""
     },
     {
@@ -1348,13 +1362,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "name": "email_variables",
+        "type": "jsonb",
+        "length": 2147483647,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was last updated.<\/p>"
+        "defaultValue": "null",
+        "comments": "<p>JSONB field to store variables related to the email content.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -1374,15 +1388,15 @@ <h3 class="box-title">Columns</h3>
         "tableName": "submission",
         "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "submission_date",
-        "type": "timestamp",
-        "length": 29,
+        "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": "null",
-        "comments": "<p>The date and time the record was created.<\/p>"
+        "comments": "<p>TBD.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -1390,13 +1404,13 @@ <h3 class="box-title">Columns</h3>
         "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": "submission_contact",
@@ -1404,41 +1418,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "business_phone_number",
+        "name": "first_name",
         "type": "varchar",
-        "length": 14,
-        "nullable": "",
+        "length": 30,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The phone number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The first name of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "birthdate",
-        "type": "date",
-        "length": 13,
-        "nullable": "√",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
+        "type": "varchar",
+        "length": 5,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The date that the BC Services Card logged in person was born.<\/p>"
+        "comments": "<p>A code representing the type of a client.<\/p>"
     },
     {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
+        "tableName": "submission",
+        "tableFileName": "submission",
         "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": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1446,55 +1460,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/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_location_contact_xref",
+        "tableFileName": "submission_location_contact_xref",
         "tableType": "Table",
         "keyClass": "primaryKey",
         "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>installed_rank",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
         "type": "int4",
         "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
     },
     {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
+        "tableName": "submission_detail",
+        "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_province_code",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 4,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/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": "district_code",
+        "tableFileName": "district_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "update_user",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1502,13 +1516,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "notes",
+        "name": "middle_name",
         "type": "varchar",
-        "length": 4000,
+        "length": 30,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Any additional information about the client or specific instructions.<\/p>"
+        "comments": "<p>The middle name of the client.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -1530,13 +1544,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "notes",
+        "name": "secondary_phone_number",
         "type": "varchar",
-        "length": 4000,
+        "length": 14,
         "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 secondary phone number of a client&rsquo;s specific location.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -1544,13 +1558,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "complementary_address_1",
+        "name": "fax_number",
         "type": "varchar",
-        "length": 40,
+        "length": 14,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A complementary address line of a client<\/p>"
+        "comments": "<p>The fax number of a client&rsquo;s specific location.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -1558,27 +1572,27 @@ <h3 class="box-title">Columns</h3>
         "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": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
+        "tableName": "submission_location_contact_xref",
+        "tableFileName": "submission_location_contact_xref",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "version",
-        "type": "varchar",
-        "length": 50,
-        "nullable": "√",
+        "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": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
     },
     {
         "tableName": "flyway_schema_history",
@@ -1586,10 +1600,10 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "type",
+        "name": "version",
         "type": "varchar",
-        "length": 20,
-        "nullable": "",
+        "length": 50,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
@@ -1600,13 +1614,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "complementary_address_2",
+        "name": "notes",
         "type": "varchar",
-        "length": 40,
+        "length": 4000,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A second complementary address line of a client<\/p>"
+        "comments": "<p>Any additional information about the client&rsquo;s location or specific instructions for contacting them.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -1614,13 +1628,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1628,13 +1642,13 @@ <h3 class="box-title">Columns</h3>
         "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>The date and time the record 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": "flyway_schema_history",
@@ -1642,10 +1656,10 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "checksum",
-        "type": "int4",
-        "length": 10,
-        "nullable": "√",
+        "name": "type",
+        "type": "varchar",
+        "length": 20,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
         "comments": ""
@@ -1656,13 +1670,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "secondary_phone_number",
+        "name": "location_name",
         "type": "varchar",
-        "length": 14,
-        "nullable": "√",
+        "length": 40,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A secondary phone number of a client&rsquo;s specific location.<\/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_matching_detail",
@@ -1682,15 +1696,15 @@ <h3 class="box-title">Columns</h3>
         "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",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "client_identification",
         "type": "varchar",
-        "length": 4,
+        "length": 40,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
+        "comments": "<p>The reference number that identifies a client.<\/p>"
     },
     {
         "tableName": "contact_type_code",
@@ -1698,13 +1712,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_status_code",
@@ -1712,13 +1726,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "submission_contact",
@@ -1726,13 +1740,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "secondary_phone_number",
+        "name": "email_address",
         "type": "varchar",
-        "length": 14,
-        "nullable": "√",
+        "length": 100,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A secondary phone number of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>The email address of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1740,27 +1754,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "good_standing_ind",
+        "name": "organization_name",
         "type": "varchar",
-        "length": 1,
+        "length": 60,
         "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>The name of the client.<\/p>"
     },
     {
-        "tableName": "submission_location_contact_xref",
-        "tableFileName": "submission_location_contact_xref",
+        "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>submission_contact_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "update_user",
+        "type": "varchar",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "submission",
@@ -1768,55 +1782,55 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "tableName": "province_code",
+        "tableFileName": "province_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "email_id",
-        "type": "varchar",
-        "length": 40,
+        "name": "display_order",
+        "type": "int4",
+        "length": 10,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>Identifier for the associated email assigned by CHES (if applicable).<\/p>"
+        "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_location",
         "tableFileName": "submission_location",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "postal_code",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
         "type": "varchar",
-        "length": 10,
+        "length": 2,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": ""
+        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
     },
     {
         "tableName": "province_code",
         "tableFileName": "province_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
         "type": "varchar",
-        "length": 100,
+        "length": 4,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1824,27 +1838,27 @@ <h3 class="box-title">Columns</h3>
         "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>The date and time the record 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": "submission_detail",
-        "tableFileName": "submission_detail",
+        "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>submission_detail_id",
-        "type": "serial",
-        "length": 10,
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "create_user",
+        "type": "varchar",
+        "length": 60,
         "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_detail_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission detail of a client.<\/p>"
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": "<p>The user or proxy account that created the record.<\/p>"
     },
     {
         "tableName": "province_code",
@@ -1852,13 +1866,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1866,13 +1880,13 @@ <h3 class="box-title">Columns</h3>
         "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,
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
         "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>"
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -1880,13 +1894,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "email_address",
+        "type": "varchar",
+        "length": 100,
         "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 email address of the Natural Resource District.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -1906,15 +1920,15 @@ <h3 class="box-title">Columns</h3>
         "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": "good_standing_ind",
         "type": "varchar",
-        "length": 5,
+        "length": 1,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the natural resource district of a client.<\/p>"
+        "comments": "<p>An indicator that determines whether a client is in good standing with respect to their financial obligations.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -1922,13 +1936,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "work_safe_bc_number",
-        "type": "varchar",
-        "length": 6,
+        "name": "birthdate",
+        "type": "date",
+        "length": 13,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A Work Safe BC number of a client.<\/p>"
+        "comments": "<p>The date that the BC Services Card logged in person was born.<\/p>"
     },
     {
         "tableName": "identification_type_code",
@@ -1936,69 +1950,69 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/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",
-        "type": "varchar",
-        "length": 2,
+        "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": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
+        "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",
-        "tableFileName": "identification_type_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>identification_type_code",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_country_code",
         "type": "varchar",
-        "length": 4,
-        "nullable": "",
+        "length": 2,
+        "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>A code representing the code of a country.<\/p>"
     },
     {
         "tableName": "submission_contact",
         "tableFileName": "submission_contact",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_name",
-        "type": "varchar",
-        "length": 30,
-        "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 first name of the client&rsquo;s contact.<\/p>"
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
         "tableName": "business_type_code",
         "tableFileName": "business_type_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "effective_date",
-        "type": "date",
-        "length": 13,
+        "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": "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>A code indicating the business type of a client.<\/p>"
     },
     {
         "tableName": "province_code",
@@ -2006,13 +2020,13 @@ <h3 class="box-title">Columns</h3>
         "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": "submission_contact",
@@ -2020,41 +2034,41 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "idp_user_id",
+        "name": "business_phone_number",
         "type": "varchar",
-        "length": 50,
-        "nullable": "√",
+        "length": 14,
+        "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The unique identifier assigned to a user by the Identity Provider.<\/p>"
+        "comments": "<p>The phone number of the client&rsquo;s contact.<\/p>"
     },
     {
         "tableName": "district_code",
         "tableFileName": "district_code",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
         "type": "varchar",
-        "length": 100,
+        "length": 5,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The email address of the Natural Resource District.<\/p>"
+        "comments": "<p>A code representing the code of a Natural Resource District.<\/p>"
     },
     {
         "tableName": "submission_detail",
         "tableFileName": "submission_detail",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "doing_business_as",
+        "keyClass": "foreignKey",
+        "keyTitle": "Foreign Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
         "type": "varchar",
-        "length": 120,
+        "length": 5,
         "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>A code representing the natural resource district of a client.<\/p>"
     },
     {
         "tableName": "submission_location",
@@ -2062,13 +2076,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "location_name",
+        "name": "city_name",
         "type": "varchar",
-        "length": 40,
+        "length": 30,
         "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>The name of the city of the location.<\/p>"
     },
     {
         "tableName": "submission_detail",
@@ -2076,23 +2090,23 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "incorporation_number",
+        "name": "client_number",
         "type": "varchar",
-        "length": 13,
+        "length": 8,
         "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": ""
     },
     {
         "tableName": "flyway_schema_history",
         "tableFileName": "flyway_schema_history",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 200,
+        "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",
@@ -2104,41 +2118,41 @@ <h3 class="box-title">Columns</h3>
         "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,
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
+        "type": "int4",
+        "length": 10,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
+        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
     },
     {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
+        "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_status_code",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "secondary_phone_number",
         "type": "varchar",
-        "length": 5,
-        "nullable": "",
+        "length": 14,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>A code representing the status of a submission request.<\/p>"
+        "comments": "<p>A secondary phone number of the client&rsquo;s contact.<\/p>"
     },
     {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
+        "tableName": "identification_type_code",
+        "tableFileName": "identification_type_code",
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "description",
+        "name": "update_user",
         "type": "varchar",
-        "length": 100,
-        "nullable": "",
+        "length": 60,
+        "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
+        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
     },
     {
         "tableName": "district_code",
@@ -2146,13 +2160,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
         "tableName": "business_type_code",
@@ -2160,27 +2174,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "create_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "create_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created.<\/p>"
     },
     {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
+        "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>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>"
+        "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": "province_code",
@@ -2188,13 +2202,13 @@ <h3 class="box-title">Columns</h3>
         "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>The date and time the record 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": "client_type_code",
@@ -2202,13 +2216,13 @@ <h3 class="box-title">Columns</h3>
         "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": "contact_type_code",
@@ -2216,27 +2230,27 @@ <h3 class="box-title">Columns</h3>
         "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>The date and time the record 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": "submission",
         "tableFileName": "submission",
         "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
+        "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": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
+        "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>"
     },
     {
         "tableName": "submission_type_code",
@@ -2244,13 +2258,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "expiry_date",
-        "type": "date",
-        "length": 13,
+        "name": "description",
+        "type": "varchar",
+        "length": 100,
         "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 description of the code value.<\/p>"
     },
     {
         "tableName": "submission_matching_detail",
@@ -2266,33 +2280,19 @@ <h3 class="box-title">Columns</h3>
         "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>"
     },
-    {
-        "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>"
-    },
     {
         "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>The date and time the record 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": "flyway_schema_history",
@@ -2300,9 +2300,9 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "execution_time",
-        "type": "int4",
-        "length": 10,
+        "name": "installed_by",
+        "type": "varchar",
+        "length": 100,
         "nullable": "",
         "autoUpdated": "",
         "defaultValue": "null",
@@ -2314,13 +2314,13 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "middle_name",
+        "name": "client_acronym",
         "type": "varchar",
-        "length": 30,
+        "length": 8,
         "nullable": "√",
         "autoUpdated": "",
         "defaultValue": "null",
-        "comments": "<p>The middle name of the client.<\/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": "contact_type_code",
@@ -2328,13 +2328,13 @@ <h3 class="box-title">Columns</h3>
         "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": "province_code",
@@ -2342,27 +2342,27 @@ <h3 class="box-title">Columns</h3>
         "tableType": "Table",
         "keyClass": "",
         "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
+        "name": "update_timestamp",
+        "type": "timestamp",
+        "length": 29,
         "nullable": "√",
         "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
+        "defaultValue": "CURRENT_TIMESTAMP",
+        "comments": "<p>The date and time the record was created or last updated.<\/p>"
     },
     {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
+        "tableName": "email_log",
+        "tableFileName": "email_log",
         "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>Timestamp indicating when the email log entry was last updated.<\/p>"
     }
 ];
                     var config = {
diff --git a/schema/nrfc/constraints.html b/schema/nrfc/constraints.html
index 69abc18146..e9abf69819 100644
--- a/schema/nrfc/constraints.html
+++ b/schema/nrfc/constraints.html
@@ -140,54 +140,54 @@ <h3 class="box-title">17 Foreign Key Constraints</h3>
                                         <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
                                     </tr>
                                     <tr>
-                                        <td>submission_contact_id_fk</td>
+                                        <td>submission_id_fk</td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission_location_contact_xref.html'>submission_location_contact_xref</a><span>.submission_contact_id</span></td>
+                                                    <td><a href='tables/submission_matching_detail.html'>submission_matching_detail</a><span>.submission_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission_contact.html'>submission_contact</a><span>.submission_contact_id</span></td>
+                                                    <td><a href='tables/submission.html'>submission</a><span>.submission_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
                                         <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
                                     </tr>
                                     <tr>
-                                        <td>submission_location_id_fk</td>
+                                        <td>submission_contact_id_fk</td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission_location_contact_xref.html'>submission_location_contact_xref</a><span>.submission_location_id</span></td>
+                                                    <td><a href='tables/submission_location_contact_xref.html'>submission_location_contact_xref</a><span>.submission_contact_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.submission_location_id</span></td>
+                                                    <td><a href='tables/submission_contact.html'>submission_contact</a><span>.submission_contact_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
                                         <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
                                     </tr>
                                     <tr>
-                                        <td>submission_id_fk</td>
+                                        <td>submission_location_id_fk</td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission_matching_detail.html'>submission_matching_detail</a><span>.submission_id</span></td>
+                                                    <td><a href='tables/submission_location_contact_xref.html'>submission_location_contact_xref</a><span>.submission_location_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
                                         <td>
                                             <table border='0' cellspacing='0' cellpadding='0'>
                                                 <tr>
-                                                    <td><a href='tables/submission.html'>submission</a><span>.submission_id</span></td>
+                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.submission_location_id</span></td>
                                                 </tr>
                                             </table>
                                         </td>
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.compact.dot b/schema/nrfc/diagrams/summary/relationships.implied.compact.dot
index a1fe71c9cc..07c0c38ca7 100644
--- a/schema/nrfc/diagrams/summary/relationships.implied.compact.dot
+++ b/schema/nrfc/diagrams/summary/relationships.implied.compact.dot
@@ -38,18 +38,6 @@ digraph "compactImpliedRelationshipsDiagram" {
     target="_top"
     tooltip="client_type_code"
   ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
   "submission_matching_detail" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
@@ -63,6 +51,18 @@ digraph "compactImpliedRelationshipsDiagram" {
     target="_top"
     tooltip="submission_matching_detail"
   ];
+  "submission_location_contact_xref" [
+   label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
+      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+    </TABLE>>
+    URL="tables/submission_location_contact_xref.html"
+    target="_top"
+    tooltip="submission_location_contact_xref"
+  ];
   "submission" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.large.dot b/schema/nrfc/diagrams/summary/relationships.implied.large.dot
index cece1a0cd3..92dfde483d 100644
--- a/schema/nrfc/diagrams/summary/relationships.implied.large.dot
+++ b/schema/nrfc/diagrams/summary/relationships.implied.large.dot
@@ -56,18 +56,6 @@ digraph "largeImpliedRelationshipsDiagram" {
     target="_top"
     tooltip="client_type_code"
   ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
   "submission_matching_detail" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
@@ -87,6 +75,18 @@ digraph "largeImpliedRelationshipsDiagram" {
     target="_top"
     tooltip="submission_matching_detail"
   ];
+  "submission_location_contact_xref" [
+   label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
+      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+    </TABLE>>
+    URL="tables/submission_location_contact_xref.html"
+    target="_top"
+    tooltip="submission_location_contact_xref"
+  ];
   "submission" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
diff --git a/schema/nrfc/diagrams/summary/relationships.real.compact.dot b/schema/nrfc/diagrams/summary/relationships.real.compact.dot
index acaf300422..0e86db0cd0 100644
--- a/schema/nrfc/diagrams/summary/relationships.real.compact.dot
+++ b/schema/nrfc/diagrams/summary/relationships.real.compact.dot
@@ -38,18 +38,6 @@ digraph "compactRelationshipsDiagram" {
     target="_top"
     tooltip="client_type_code"
   ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
   "submission_matching_detail" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
@@ -63,6 +51,18 @@ digraph "compactRelationshipsDiagram" {
     target="_top"
     tooltip="submission_matching_detail"
   ];
+  "submission_location_contact_xref" [
+   label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
+      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+    </TABLE>>
+    URL="tables/submission_location_contact_xref.html"
+    target="_top"
+    tooltip="submission_location_contact_xref"
+  ];
   "submission" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
diff --git a/schema/nrfc/diagrams/summary/relationships.real.large.dot b/schema/nrfc/diagrams/summary/relationships.real.large.dot
index 61e86b0572..fadd9d269e 100644
--- a/schema/nrfc/diagrams/summary/relationships.real.large.dot
+++ b/schema/nrfc/diagrams/summary/relationships.real.large.dot
@@ -56,18 +56,6 @@ digraph "largeRelationshipsDiagram" {
     target="_top"
     tooltip="client_type_code"
   ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
   "submission_matching_detail" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
@@ -87,6 +75,18 @@ digraph "largeRelationshipsDiagram" {
     target="_top"
     tooltip="submission_matching_detail"
   ];
+  "submission_location_contact_xref" [
+   label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
+      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16"><B>submission_location_contact_xref</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_location_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
+      <TR><TD PORT="submission_contact_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/primaryKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="200" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
+      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
+    </TABLE>>
+    URL="tables/submission_location_contact_xref.html"
+    target="_top"
+    tooltip="submission_location_contact_xref"
+  ];
   "submission" [
    label=<
     <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
diff --git a/schema/nrfc/index.html b/schema/nrfc/index.html
index 8e1e83a26b..5385307560 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 23 21:50 GMT 2024</p>
+                                <p>Generated on Tue Sep 24 21:27 GMT 2024</p>
                             </div>
                         </div>
                     </div>
@@ -224,22 +224,22 @@ <h3 class="box-title">Tables</h3>
                                         <td class="comment detail" style="display: table-cell;"><p>A code indicating the type of a client. Examples include, but are not limited to: Corporation, Individual, Association, and others.</p></td>
                                     </tr>
                                     <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_location_contact_xref.html">submission_location_contact_xref</a></td>
+                                        <td class="detail"><a href="tables/submission_matching_detail.html">submission_matching_detail</a></td>
                                         <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">2</td>
+                                        <td class="detail" align="right">1</td>
+                                        <td class="detail" align="right">9</td>
                                         <td class="detail" align="right">-1</td>
                                         <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>Identifies the multiple addresses for a given client, as well as the many contacts that may belong to a given address.</p></td>
+                                        <td class="comment detail" style="display: table-cell;"><p>The number of matches, if any, found in the legacy oracle database. These matches are determined through a combination of fuzzy search in specific fields and exact equality in others.</p></td>
                                     </tr>
                                     <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_matching_detail.html">submission_matching_detail</a></td>
+                                        <td class="detail"><a href="tables/submission_location_contact_xref.html">submission_location_contact_xref</a></td>
                                         <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">9</td>
+                                        <td class="detail" align="right">2</td>
+                                        <td class="detail" align="right">2</td>
                                         <td class="detail" align="right">-1</td>
                                         <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>The number of matches, if any, found in the legacy oracle database. These matches are determined through a combination of fuzzy search in specific fields and exact equality in others.</p></td>
+                                        <td class="comment detail" style="display: table-cell;"><p>Identifies the multiple addresses for a given client, as well as the many contacts that may belong to a given address.</p></td>
                                     </tr>
                                     <tr class="tbl even" valign="top">
                                         <td class="detail"><a href="tables/flyway_schema_history.html">flyway_schema_history</a></td>
diff --git a/schema/nrfc/info-html.txt b/schema/nrfc/info-html.txt
index bdd287aedc..3a0c1c1bca 100644
--- a/schema/nrfc/info-html.txt
+++ b/schema/nrfc/info-html.txt
@@ -1,4 +1,4 @@
-date=2024-09-23 21:51:00+0000
+date=2024-09-24 21:27:26+0000
 os=Linux 6.8.0-1014-azure
 schemaspy-version=6.2.4
 schemaspy-build=6.2.4.41 2023-07-21 11:15:12
diff --git a/schema/nrfc/relationships.html b/schema/nrfc/relationships.html
index b746c91c6e..7daf07adfd 100644
--- a/schema/nrfc/relationships.html
+++ b/schema/nrfc/relationships.html
@@ -100,9 +100,9 @@ <h5>By default only columns that are primary keys, foreign keys or indexes are s
 <area shape="rect" id="node14" href="tables/contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="343,64,570,181">
 <area shape="rect" id="node2" href="tables/submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,205,276,323">
 <area shape="rect" id="node3" href="tables/client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,756,562,873">
-<area shape="rect" id="node4" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,169,1380,292">
+<area shape="rect" id="node4" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,199,989,345">
+<area shape="rect" id="node5" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,169,1380,292">
 <area shape="rect" id="node7" href="tables/submission_location.html" target="_top" title="submission_location" alt="" coords="683,363,943,568">
-<area shape="rect" id="node5" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,199,989,345">
 <area shape="rect" id="node9" href="tables/submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,340,269,457">
 <area shape="rect" id="node8" href="tables/province_code.html" target="_top" title="province_code" alt="" coords="357,592,557,739">
 <area shape="rect" id="node15" href="tables/country_code.html" target="_top" title="country_code" alt="" coords="41,521,241,668">
@@ -120,9 +120,9 @@ <h5>By default only columns that are primary keys, foreign keys or indexes are s
 <area shape="rect" id="node14" href="tables/contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="343,64,570,363">
 <area shape="rect" id="node2" href="tables/submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,296,276,595">
 <area shape="rect" id="node3" href="tables/client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,1423,562,1721">
-<area shape="rect" id="node4" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,351,1380,473">
+<area shape="rect" id="node4" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,380,989,708">
+<area shape="rect" id="node5" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,351,1380,473">
 <area shape="rect" id="node7" href="tables/submission_location.html" target="_top" title="submission_location" alt="" coords="683,725,943,1229">
-<area shape="rect" id="node5" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,380,989,708">
 <area shape="rect" id="node9" href="tables/submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,612,269,911">
 <area shape="rect" id="node8" href="tables/province_code.html" target="_top" title="province_code" alt="" coords="357,1048,557,1405">
 <area shape="rect" id="node15" href="tables/country_code.html" target="_top" title="country_code" alt="" coords="41,931,241,1259">
@@ -140,9 +140,9 @@ <h5>By default only columns that are primary keys, foreign keys or indexes are s
 <area shape="rect" id="node14" href="tables/contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="343,64,570,181">
 <area shape="rect" id="node2" href="tables/submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,185,276,303">
 <area shape="rect" id="node3" href="tables/client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,756,562,873">
-<area shape="rect" id="node4" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,169,1380,292">
+<area shape="rect" id="node4" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,199,989,345">
+<area shape="rect" id="node5" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,169,1380,292">
 <area shape="rect" id="node7" href="tables/submission_location.html" target="_top" title="submission_location" alt="" coords="683,363,943,568">
-<area shape="rect" id="node5" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,199,989,345">
 <area shape="rect" id="node9" href="tables/submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,320,269,437">
 <area shape="rect" id="node8" href="tables/province_code.html" target="_top" title="province_code" alt="" coords="357,457,557,604">
 <area shape="rect" id="node15" href="tables/country_code.html" target="_top" title="country_code" alt="" coords="41,487,241,633">
@@ -160,9 +160,9 @@ <h5>By default only columns that are primary keys, foreign keys or indexes are s
 <area shape="rect" id="node14" href="tables/contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="343,64,570,363">
 <area shape="rect" id="node2" href="tables/submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,219,276,517">
 <area shape="rect" id="node3" href="tables/client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,1533,562,1832">
-<area shape="rect" id="node4" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,351,1380,473">
+<area shape="rect" id="node4" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,380,989,708">
+<area shape="rect" id="node5" href="tables/submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1033,351,1380,473">
 <area shape="rect" id="node7" href="tables/submission_location.html" target="_top" title="submission_location" alt="" coords="683,725,943,1229">
-<area shape="rect" id="node5" href="tables/submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="637,380,989,708">
 <area shape="rect" id="node9" href="tables/submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,535,269,833">
 <area shape="rect" id="node8" href="tables/province_code.html" target="_top" title="province_code" alt="" coords="357,843,557,1200">
 <area shape="rect" id="node15" href="tables/country_code.html" target="_top" title="country_code" alt="" coords="41,872,241,1200">