diff --git a/schema/anomalies.js b/anomalies.js
similarity index 100%
rename from schema/anomalies.js
rename to anomalies.js
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap-theme.css b/bower/admin-lte/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap-theme.css
rename to bower/admin-lte/bootstrap/css/bootstrap-theme.css
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map b/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
rename to bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css b/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
rename to bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map b/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
rename to bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap.css b/bower/admin-lte/bootstrap/css/bootstrap.css
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap.css
rename to bower/admin-lte/bootstrap/css/bootstrap.css
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap.css.map b/bower/admin-lte/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap.css.map
rename to bower/admin-lte/bootstrap/css/bootstrap.css.map
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap.min.css b/bower/admin-lte/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap.min.css
rename to bower/admin-lte/bootstrap/css/bootstrap.min.css
diff --git a/schema/bower/admin-lte/bootstrap/css/bootstrap.min.css.map b/bower/admin-lte/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/css/bootstrap.min.css.map
rename to bower/admin-lte/bootstrap/css/bootstrap.min.css.map
diff --git a/schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot b/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg b/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf b/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff b/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/schema/bower/admin-lte/bootstrap/js/bootstrap.js b/bower/admin-lte/bootstrap/js/bootstrap.js
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/js/bootstrap.js
rename to bower/admin-lte/bootstrap/js/bootstrap.js
diff --git a/schema/bower/admin-lte/bootstrap/js/bootstrap.min.js b/bower/admin-lte/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/js/bootstrap.min.js
rename to bower/admin-lte/bootstrap/js/bootstrap.min.js
diff --git a/schema/bower/admin-lte/bootstrap/js/npm.js b/bower/admin-lte/bootstrap/js/npm.js
similarity index 100%
rename from schema/bower/admin-lte/bootstrap/js/npm.js
rename to bower/admin-lte/bootstrap/js/npm.js
diff --git a/schema/bower/admin-lte/dist/css/AdminLTE.css b/bower/admin-lte/dist/css/AdminLTE.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/AdminLTE.css
rename to bower/admin-lte/dist/css/AdminLTE.css
diff --git a/schema/bower/admin-lte/dist/css/AdminLTE.min.css b/bower/admin-lte/dist/css/AdminLTE.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/AdminLTE.min.css
rename to bower/admin-lte/dist/css/AdminLTE.min.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css b/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css b/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css b/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css b/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-select2.css b/bower/admin-lte/dist/css/alt/AdminLTE-select2.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-select2.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-select2.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css b/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css b/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
diff --git a/schema/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css b/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
rename to bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/_all-skins.css b/bower/admin-lte/dist/css/skins/_all-skins.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/_all-skins.css
rename to bower/admin-lte/dist/css/skins/_all-skins.css
diff --git a/schema/bower/admin-lte/dist/css/skins/_all-skins.min.css b/bower/admin-lte/dist/css/skins/_all-skins.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/_all-skins.min.css
rename to bower/admin-lte/dist/css/skins/_all-skins.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-black-light.css b/bower/admin-lte/dist/css/skins/skin-black-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-black-light.css
rename to bower/admin-lte/dist/css/skins/skin-black-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-black-light.min.css b/bower/admin-lte/dist/css/skins/skin-black-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-black-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-black-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-black.css b/bower/admin-lte/dist/css/skins/skin-black.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-black.css
rename to bower/admin-lte/dist/css/skins/skin-black.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-black.min.css b/bower/admin-lte/dist/css/skins/skin-black.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-black.min.css
rename to bower/admin-lte/dist/css/skins/skin-black.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-blue-light.css b/bower/admin-lte/dist/css/skins/skin-blue-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-blue-light.css
rename to bower/admin-lte/dist/css/skins/skin-blue-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-blue-light.min.css b/bower/admin-lte/dist/css/skins/skin-blue-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-blue-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-blue-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-blue.css b/bower/admin-lte/dist/css/skins/skin-blue.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-blue.css
rename to bower/admin-lte/dist/css/skins/skin-blue.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-blue.min.css b/bower/admin-lte/dist/css/skins/skin-blue.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-blue.min.css
rename to bower/admin-lte/dist/css/skins/skin-blue.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-green-light.css b/bower/admin-lte/dist/css/skins/skin-green-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-green-light.css
rename to bower/admin-lte/dist/css/skins/skin-green-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-green-light.min.css b/bower/admin-lte/dist/css/skins/skin-green-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-green-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-green-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-green.css b/bower/admin-lte/dist/css/skins/skin-green.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-green.css
rename to bower/admin-lte/dist/css/skins/skin-green.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-green.min.css b/bower/admin-lte/dist/css/skins/skin-green.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-green.min.css
rename to bower/admin-lte/dist/css/skins/skin-green.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-purple-light.css b/bower/admin-lte/dist/css/skins/skin-purple-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-purple-light.css
rename to bower/admin-lte/dist/css/skins/skin-purple-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-purple-light.min.css b/bower/admin-lte/dist/css/skins/skin-purple-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-purple-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-purple-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-purple.css b/bower/admin-lte/dist/css/skins/skin-purple.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-purple.css
rename to bower/admin-lte/dist/css/skins/skin-purple.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-purple.min.css b/bower/admin-lte/dist/css/skins/skin-purple.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-purple.min.css
rename to bower/admin-lte/dist/css/skins/skin-purple.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-red-light.css b/bower/admin-lte/dist/css/skins/skin-red-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-red-light.css
rename to bower/admin-lte/dist/css/skins/skin-red-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-red-light.min.css b/bower/admin-lte/dist/css/skins/skin-red-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-red-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-red-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-red.css b/bower/admin-lte/dist/css/skins/skin-red.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-red.css
rename to bower/admin-lte/dist/css/skins/skin-red.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-red.min.css b/bower/admin-lte/dist/css/skins/skin-red.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-red.min.css
rename to bower/admin-lte/dist/css/skins/skin-red.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-yellow-light.css b/bower/admin-lte/dist/css/skins/skin-yellow-light.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-yellow-light.css
rename to bower/admin-lte/dist/css/skins/skin-yellow-light.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css b/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
rename to bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-yellow.css b/bower/admin-lte/dist/css/skins/skin-yellow.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-yellow.css
rename to bower/admin-lte/dist/css/skins/skin-yellow.css
diff --git a/schema/bower/admin-lte/dist/css/skins/skin-yellow.min.css b/bower/admin-lte/dist/css/skins/skin-yellow.min.css
similarity index 100%
rename from schema/bower/admin-lte/dist/css/skins/skin-yellow.min.css
rename to bower/admin-lte/dist/css/skins/skin-yellow.min.css
diff --git a/schema/bower/admin-lte/dist/js/app.js b/bower/admin-lte/dist/js/app.js
similarity index 100%
rename from schema/bower/admin-lte/dist/js/app.js
rename to bower/admin-lte/dist/js/app.js
diff --git a/schema/bower/admin-lte/dist/js/app.min.js b/bower/admin-lte/dist/js/app.min.js
similarity index 100%
rename from schema/bower/admin-lte/dist/js/app.min.js
rename to bower/admin-lte/dist/js/app.min.js
diff --git a/schema/bower/admin-lte/dist/js/demo.js b/bower/admin-lte/dist/js/demo.js
similarity index 100%
rename from schema/bower/admin-lte/dist/js/demo.js
rename to bower/admin-lte/dist/js/demo.js
diff --git a/schema/bower/admin-lte/dist/js/pages/dashboard.js b/bower/admin-lte/dist/js/pages/dashboard.js
similarity index 100%
rename from schema/bower/admin-lte/dist/js/pages/dashboard.js
rename to bower/admin-lte/dist/js/pages/dashboard.js
diff --git a/schema/bower/admin-lte/dist/js/pages/dashboard2.js b/bower/admin-lte/dist/js/pages/dashboard2.js
similarity index 100%
rename from schema/bower/admin-lte/dist/js/pages/dashboard2.js
rename to bower/admin-lte/dist/js/pages/dashboard2.js
diff --git a/schema/bower/admin-lte/plugins/fastclick/fastclick.js b/bower/admin-lte/plugins/fastclick/fastclick.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/fastclick/fastclick.js
rename to bower/admin-lte/plugins/fastclick/fastclick.js
diff --git a/schema/bower/admin-lte/plugins/fastclick/fastclick.min.js b/bower/admin-lte/plugins/fastclick/fastclick.min.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/fastclick/fastclick.min.js
rename to bower/admin-lte/plugins/fastclick/fastclick.min.js
diff --git a/schema/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js b/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
rename to bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
diff --git a/schema/bower/admin-lte/plugins/jQueryUI/jquery-ui.js b/bower/admin-lte/plugins/jQueryUI/jquery-ui.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/jQueryUI/jquery-ui.js
rename to bower/admin-lte/plugins/jQueryUI/jquery-ui.js
diff --git a/schema/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js b/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
rename to bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
diff --git a/schema/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js b/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
rename to bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
diff --git a/schema/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js b/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
similarity index 100%
rename from schema/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
rename to bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
diff --git a/schema/bower/anchor-js/anchor.min.js b/bower/anchor-js/anchor.min.js
similarity index 100%
rename from schema/bower/anchor-js/anchor.min.js
rename to bower/anchor-js/anchor.min.js
diff --git a/schema/bower/codemirror/codemirror.css b/bower/codemirror/codemirror.css
similarity index 100%
rename from schema/bower/codemirror/codemirror.css
rename to bower/codemirror/codemirror.css
diff --git a/schema/bower/codemirror/codemirror.js b/bower/codemirror/codemirror.js
similarity index 100%
rename from schema/bower/codemirror/codemirror.js
rename to bower/codemirror/codemirror.js
diff --git a/schema/bower/codemirror/sql.js b/bower/codemirror/sql.js
similarity index 100%
rename from schema/bower/codemirror/sql.js
rename to bower/codemirror/sql.js
diff --git a/schema/bower/datatables.net-bs/css/dataTables.bootstrap.css b/bower/datatables.net-bs/css/dataTables.bootstrap.css
similarity index 100%
rename from schema/bower/datatables.net-bs/css/dataTables.bootstrap.css
rename to bower/datatables.net-bs/css/dataTables.bootstrap.css
diff --git a/schema/bower/datatables.net-bs/css/dataTables.bootstrap.min.css b/bower/datatables.net-bs/css/dataTables.bootstrap.min.css
similarity index 100%
rename from schema/bower/datatables.net-bs/css/dataTables.bootstrap.min.css
rename to bower/datatables.net-bs/css/dataTables.bootstrap.min.css
diff --git a/schema/bower/datatables.net-bs/js/dataTables.bootstrap.js b/bower/datatables.net-bs/js/dataTables.bootstrap.js
similarity index 100%
rename from schema/bower/datatables.net-bs/js/dataTables.bootstrap.js
rename to bower/datatables.net-bs/js/dataTables.bootstrap.js
diff --git a/schema/bower/datatables.net-bs/js/dataTables.bootstrap.min.js b/bower/datatables.net-bs/js/dataTables.bootstrap.min.js
similarity index 100%
rename from schema/bower/datatables.net-bs/js/dataTables.bootstrap.min.js
rename to bower/datatables.net-bs/js/dataTables.bootstrap.min.js
diff --git a/schema/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css b/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
similarity index 100%
rename from schema/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
rename to bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
diff --git a/schema/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css b/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
similarity index 100%
rename from schema/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
rename to bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
diff --git a/schema/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js b/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
similarity index 100%
rename from schema/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
rename to bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
diff --git a/schema/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js b/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
rename to bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
diff --git a/schema/bower/datatables.net-buttons/buttons.colVis.js b/bower/datatables.net-buttons/buttons.colVis.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.colVis.js
rename to bower/datatables.net-buttons/buttons.colVis.js
diff --git a/schema/bower/datatables.net-buttons/buttons.colVis.min.js b/bower/datatables.net-buttons/buttons.colVis.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.colVis.min.js
rename to bower/datatables.net-buttons/buttons.colVis.min.js
diff --git a/schema/bower/datatables.net-buttons/buttons.flash.js b/bower/datatables.net-buttons/buttons.flash.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.flash.js
rename to bower/datatables.net-buttons/buttons.flash.js
diff --git a/schema/bower/datatables.net-buttons/buttons.flash.min.js b/bower/datatables.net-buttons/buttons.flash.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.flash.min.js
rename to bower/datatables.net-buttons/buttons.flash.min.js
diff --git a/schema/bower/datatables.net-buttons/buttons.html5.js b/bower/datatables.net-buttons/buttons.html5.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.html5.js
rename to bower/datatables.net-buttons/buttons.html5.js
diff --git a/schema/bower/datatables.net-buttons/buttons.html5.min.js b/bower/datatables.net-buttons/buttons.html5.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.html5.min.js
rename to bower/datatables.net-buttons/buttons.html5.min.js
diff --git a/schema/bower/datatables.net-buttons/buttons.print.js b/bower/datatables.net-buttons/buttons.print.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.print.js
rename to bower/datatables.net-buttons/buttons.print.js
diff --git a/schema/bower/datatables.net-buttons/buttons.print.min.js b/bower/datatables.net-buttons/buttons.print.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/buttons.print.min.js
rename to bower/datatables.net-buttons/buttons.print.min.js
diff --git a/schema/bower/datatables.net-buttons/dataTables.buttons.js b/bower/datatables.net-buttons/dataTables.buttons.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/dataTables.buttons.js
rename to bower/datatables.net-buttons/dataTables.buttons.js
diff --git a/schema/bower/datatables.net-buttons/dataTables.buttons.min.js b/bower/datatables.net-buttons/dataTables.buttons.min.js
similarity index 100%
rename from schema/bower/datatables.net-buttons/dataTables.buttons.min.js
rename to bower/datatables.net-buttons/dataTables.buttons.min.js
diff --git a/schema/bower/datatables.net/jquery.dataTables.min.js b/bower/datatables.net/jquery.dataTables.min.js
similarity index 100%
rename from schema/bower/datatables.net/jquery.dataTables.min.js
rename to bower/datatables.net/jquery.dataTables.min.js
diff --git a/schema/bower/font-awesome/css/font-awesome.css b/bower/font-awesome/css/font-awesome.css
similarity index 100%
rename from schema/bower/font-awesome/css/font-awesome.css
rename to bower/font-awesome/css/font-awesome.css
diff --git a/schema/bower/font-awesome/css/font-awesome.css.map b/bower/font-awesome/css/font-awesome.css.map
similarity index 100%
rename from schema/bower/font-awesome/css/font-awesome.css.map
rename to bower/font-awesome/css/font-awesome.css.map
diff --git a/schema/bower/font-awesome/css/font-awesome.min.css b/bower/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from schema/bower/font-awesome/css/font-awesome.min.css
rename to bower/font-awesome/css/font-awesome.min.css
diff --git a/schema/bower/font-awesome/fonts/FontAwesome.otf b/bower/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from schema/bower/font-awesome/fonts/FontAwesome.otf
rename to bower/font-awesome/fonts/FontAwesome.otf
diff --git a/schema/bower/font-awesome/fonts/fontawesome-webfont.eot b/bower/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from schema/bower/font-awesome/fonts/fontawesome-webfont.eot
rename to bower/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/schema/bower/font-awesome/fonts/fontawesome-webfont.svg b/bower/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from schema/bower/font-awesome/fonts/fontawesome-webfont.svg
rename to bower/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/schema/bower/font-awesome/fonts/fontawesome-webfont.ttf b/bower/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from schema/bower/font-awesome/fonts/fontawesome-webfont.ttf
rename to bower/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/schema/bower/font-awesome/fonts/fontawesome-webfont.woff b/bower/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from schema/bower/font-awesome/fonts/fontawesome-webfont.woff
rename to bower/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/schema/bower/font-awesome/fonts/fontawesome-webfont.woff2 b/bower/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from schema/bower/font-awesome/fonts/fontawesome-webfont.woff2
rename to bower/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/schema/bower/html5shiv/html5shiv.min.js b/bower/html5shiv/html5shiv.min.js
similarity index 100%
rename from schema/bower/html5shiv/html5shiv.min.js
rename to bower/html5shiv/html5shiv.min.js
diff --git a/schema/bower/ionicons/css/ionicons.css b/bower/ionicons/css/ionicons.css
similarity index 100%
rename from schema/bower/ionicons/css/ionicons.css
rename to bower/ionicons/css/ionicons.css
diff --git a/schema/bower/ionicons/css/ionicons.min.css b/bower/ionicons/css/ionicons.min.css
similarity index 100%
rename from schema/bower/ionicons/css/ionicons.min.css
rename to bower/ionicons/css/ionicons.min.css
diff --git a/schema/bower/ionicons/fonts/ionicons.eot b/bower/ionicons/fonts/ionicons.eot
similarity index 100%
rename from schema/bower/ionicons/fonts/ionicons.eot
rename to bower/ionicons/fonts/ionicons.eot
diff --git a/schema/bower/ionicons/fonts/ionicons.svg b/bower/ionicons/fonts/ionicons.svg
similarity index 100%
rename from schema/bower/ionicons/fonts/ionicons.svg
rename to bower/ionicons/fonts/ionicons.svg
diff --git a/schema/bower/ionicons/fonts/ionicons.ttf b/bower/ionicons/fonts/ionicons.ttf
similarity index 100%
rename from schema/bower/ionicons/fonts/ionicons.ttf
rename to bower/ionicons/fonts/ionicons.ttf
diff --git a/schema/bower/ionicons/fonts/ionicons.woff b/bower/ionicons/fonts/ionicons.woff
similarity index 100%
rename from schema/bower/ionicons/fonts/ionicons.woff
rename to bower/ionicons/fonts/ionicons.woff
diff --git a/schema/bower/jquery/jquery.js b/bower/jquery/jquery.js
similarity index 100%
rename from schema/bower/jquery/jquery.js
rename to bower/jquery/jquery.js
diff --git a/schema/bower/js-xlsx/xlsx.full.min.js b/bower/js-xlsx/xlsx.full.min.js
similarity index 100%
rename from schema/bower/js-xlsx/xlsx.full.min.js
rename to bower/js-xlsx/xlsx.full.min.js
diff --git a/schema/bower/pdfmake/pdfmake.min.js b/bower/pdfmake/pdfmake.min.js
similarity index 100%
rename from schema/bower/pdfmake/pdfmake.min.js
rename to bower/pdfmake/pdfmake.min.js
diff --git a/schema/bower/pdfmake/vfs_fonts.js b/bower/pdfmake/vfs_fonts.js
similarity index 100%
rename from schema/bower/pdfmake/vfs_fonts.js
rename to bower/pdfmake/vfs_fonts.js
diff --git a/schema/bower/respond/respond.min.js b/bower/respond/respond.min.js
similarity index 100%
rename from schema/bower/respond/respond.min.js
rename to bower/respond/respond.min.js
diff --git a/schema/bower/salvattore/salvattore.css b/bower/salvattore/salvattore.css
similarity index 100%
rename from schema/bower/salvattore/salvattore.css
rename to bower/salvattore/salvattore.css
diff --git a/schema/bower/salvattore/salvattore.min.js b/bower/salvattore/salvattore.min.js
similarity index 100%
rename from schema/bower/salvattore/salvattore.min.js
rename to bower/salvattore/salvattore.min.js
diff --git a/schema/column.js b/column.js
similarity index 100%
rename from schema/column.js
rename to column.js
diff --git a/schema/constraint.js b/constraint.js
similarity index 100%
rename from schema/constraint.js
rename to constraint.js
diff --git a/schema/favicon.png b/favicon.png
similarity index 100%
rename from schema/favicon.png
rename to favicon.png
diff --git a/schema/fonts/indieflower/indie-flower-v8-latin-regular.eot b/fonts/indieflower/indie-flower-v8-latin-regular.eot
similarity index 100%
rename from schema/fonts/indieflower/indie-flower-v8-latin-regular.eot
rename to fonts/indieflower/indie-flower-v8-latin-regular.eot
diff --git a/schema/fonts/indieflower/indie-flower-v8-latin-regular.svg b/fonts/indieflower/indie-flower-v8-latin-regular.svg
similarity index 100%
rename from schema/fonts/indieflower/indie-flower-v8-latin-regular.svg
rename to fonts/indieflower/indie-flower-v8-latin-regular.svg
diff --git a/schema/fonts/indieflower/indie-flower-v8-latin-regular.ttf b/fonts/indieflower/indie-flower-v8-latin-regular.ttf
similarity index 100%
rename from schema/fonts/indieflower/indie-flower-v8-latin-regular.ttf
rename to fonts/indieflower/indie-flower-v8-latin-regular.ttf
diff --git a/schema/fonts/indieflower/indie-flower-v8-latin-regular.woff b/fonts/indieflower/indie-flower-v8-latin-regular.woff
similarity index 100%
rename from schema/fonts/indieflower/indie-flower-v8-latin-regular.woff
rename to fonts/indieflower/indie-flower-v8-latin-regular.woff
diff --git a/schema/fonts/indieflower/indie-flower-v8-latin-regular.woff2 b/fonts/indieflower/indie-flower-v8-latin-regular.woff2
similarity index 100%
rename from schema/fonts/indieflower/indie-flower-v8-latin-regular.woff2
rename to fonts/indieflower/indie-flower-v8-latin-regular.woff2
diff --git a/schema/fonts/indieflower/indie-flower.css b/fonts/indieflower/indie-flower.css
similarity index 100%
rename from schema/fonts/indieflower/indie-flower.css
rename to fonts/indieflower/indie-flower.css
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot b/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg b/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf b/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff b/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
diff --git a/schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2 b/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
rename to fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
diff --git a/schema/fonts/source-sans-pro/source-sans-pro.css b/fonts/source-sans-pro/source-sans-pro.css
similarity index 100%
rename from schema/fonts/source-sans-pro/source-sans-pro.css
rename to fonts/source-sans-pro/source-sans-pro.css
diff --git a/schema/images/foreignKey.png b/images/foreignKey.png
similarity index 100%
rename from schema/images/foreignKey.png
rename to images/foreignKey.png
diff --git a/schema/images/foreignKeys.png b/images/foreignKeys.png
similarity index 100%
rename from schema/images/foreignKeys.png
rename to images/foreignKeys.png
diff --git a/schema/images/primaryKey.png b/images/primaryKey.png
similarity index 100%
rename from schema/images/primaryKey.png
rename to images/primaryKey.png
diff --git a/schema/images/primaryKeys.png b/images/primaryKeys.png
similarity index 100%
rename from schema/images/primaryKeys.png
rename to images/primaryKeys.png
diff --git a/index.html b/index.html
index e67d997575..09bd7edef8 100644
--- a/index.html
+++ b/index.html
@@ -1,67 +1,147 @@
-<!-- PROJECT SHIELDS -->
-<!-- [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=bcgov_nr-quickstart-typescript&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=bcgov_nr-quickstart-typescript) -->
-<p><a
-href="https://github.com/bcgov/nr-forest-client/actions/workflows/merge.yml"><img
-src="https://github.com/bcgov/nr-forest-client/actions/workflows/merge.yml/badge.svg"
-alt="Merge to Main" /></a> <a
-href="https://github.com/bcgov/nr-forest-client/actions/workflows/analysis.yml"><img
-src="https://github.com/bcgov/nr-forest-client/actions/workflows/analysis.yml/badge.svg"
-alt="Unit Tests and Analysis" /></a></p>
-<p><a href="/../../issues"><img
-src="https://img.shields.io/github/issues/bcgov/nr-forest-client"
-alt="Issues" /></a> <a href="/../../pulls"><img
-src="https://img.shields.io/github/issues-pr/bcgov/nr-forest-client"
-alt="Pull Requests" /></a> <a href="/LICENSE.md"><img
-src="https://img.shields.io/github/license/bcgov/nr-forest-client.svg"
-alt="MIT License" /></a> <a
-href="https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.md"><img
-src="https://img.shields.io/badge/Lifecycle-Experimental-339999"
-alt="Lifecycle" /></a></p>
-<p>The nr-forest-client is a node.js application built with <a
-href="https://vuejs.org">Vue.js</a> in typescript as frontend, <a
-href="https://spring.io/projects/spring-boot#learn">Spring boot java</a>
-as backend, postgres and oracle for database, integrated with the <a
-href="https://github.com/bcgov/greenfield-template">greenfield-template</a>
-to automate the process for testing, security scanning, code quality
-checking, image building and deploying.</p>
-<h2 id="frontend">Frontend</h2>
-<p>The frontend is built in Vue3 composition api, more info <a
-href="frontend/index.html">here</a></p>
-<h2 id="backend">Backend</h2>
-<p>The backend is built in Java 17 using Spring Boot 3. It is composed
-of multiple components, more info about the <a
-href="backend/index.html">backend here</a>, the <a
-href="legacy/index.html">legacy</a> part that handles oracle connections
-and the <a href="processor/index.html">processor</a> that handles the
-submission processing part.</p>
-<h2 id="email-templates">Email templates</h2>
-<p>For more info about the email templates, <a
-href="backend/docs/MAIL_FORMAT.md">click here</a></p>
-<h2 id="automated-end-to-end-tests">Automated End-to-End tests</h2>
-<p>For automated end-to-end tests with cypress you can check <a
-href="cypress/index.html">here</a>. This is used to validate user
-journeys and some other cases.</p>
-<h2 id="database-schema-documentation">Database Schema
-documentation</h2>
-<p>As the application evolves, so does the data, and to control the
-evolution of the database that stores all this new data. To make it in a
-controllable way, we can apply the same strategy we use for our codebase
-into our database. To achieve that, we can use tools that will version
-and apply changes into the database in a controlled way. Team Alliance
-decided to make use of <a
-href="https://documentation.red-gate.com/flyway">Flyway</a> as the
-de-facto tool to database versioning. This means that we can recreate
-the database structure as many times as we need, along with basic data
-that needs to be inserted into the database.</p>
-<p>We have the database schema documented using <a
-href="https://schemaspy.org/">SchemaSpy</a>. This is particularly useful
-tool for database administrators, developers, and analysts who need to
-understand the structure and relationships within a database. This allow
-us to automatically generate a visualization of the database schema
-through Entity-Relationship (ER) diagrams. These diagrams help users
-quickly grasp the relationships between tables, making it easier to
-navigate and understand complex databases.</p>
-<p>You can find our database diagram on <a
-href="https://bcgov.github.io/nr-forest-client/schema/nrfc/relationships.html">this
-page</a> and more information about the database on <a
-href="https://bcgov.github.io/nr-forest-client/schema">this page</a></p>
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>default</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="bower/html5shiv/html5shiv.min.js"></script>
+        <script src="bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <div class="callout callout-info">
+                        <h4>SchemaSpy Analysis of default</h4>
+                        <p>Generated on Sat Nov 16 11:04 GMT 2024</p>
+                    </div>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <h3 class="box-title">Database Properties</h3>
+                            <span class="label label-primary pull-right"><i class="fa fa-cog fa-2x"></i></span>
+                        </div><!-- /.box-header -->
+                        <div class="box-body">
+                            <p>Database Type: PostgreSQL - 16.4 (Debian 16.4-1.pgdg110+2)</p>
+                        </div><!-- /.box-body -->
+                    </div>
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <h3 class="box-title">1 Schemas</h3>
+                            <span class="label label-primary pull-right"><i class="fa fa-database fa-2x"></i></span>
+                        </div><!-- /.box-header -->
+                        <div class="box-body">
+                            <table
+                                    id="database_objects"
+                                    class="table table-bordered table-striped dataTable"
+                                    role="grid"
+                                    data-paging="true"
+                                    data-page-length="50"
+                                    data-length-change="false">
+                                <thead>
+                                    <tr>
+                                        <th valign="bottom">Schema</th>
+                                        <th valign="bottom">Comments</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr class="tbl even" valign="top">
+                                        <td class="detail"><a href="users/index.html">users</a></td>
+                                        <td class="comment detail" style="display: table-cell;"></td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- /.box-body -->
+                    </div>
+                </section>
+                <!-- /.content -->
+
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="bower/pdfmake/pdfmake.min.js"></script>
+        <script src="bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="bower/codemirror/codemirror.js"></script>
+        <script src="bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="bower/admin-lte/dist/js/app.min.js"></script>
+        <script src=""></script>
+        <script src="schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/schema/main.js b/main.js
similarity index 100%
rename from schema/main.js
rename to main.js
diff --git a/schema/nrfc/relationships.js b/relationships.js
similarity index 100%
rename from schema/nrfc/relationships.js
rename to relationships.js
diff --git a/schema/nrfc/routines.js b/routines.js
similarity index 100%
rename from schema/nrfc/routines.js
rename to routines.js
diff --git a/schema/nrfc/routines/routine.js b/routines/routine.js
similarity index 100%
rename from schema/nrfc/routines/routine.js
rename to routines/routine.js
diff --git a/schema/nrfc/columns.html b/schema/nrfc/columns.html
deleted file mode 100644
index b5598f97c8..0000000000
--- a/schema/nrfc/columns.html
+++ /dev/null
@@ -1,2421 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="bower/html5shiv/html5shiv.min.js"></script>
-        <script src="bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>Columns</h1>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 class="box-title">Columns</h3>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="column_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="50"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                    <tr>
-                                        <th>Table</th>
-                                        <th>Type</th>
-                                        <th>Column</th>
-                                        <th>Type</th>
-                                        <th>Size</th>
-                                        <th title='Are nulls allowed?'>Nullable</th>
-                                        <th title='Is column automatically updated?'>Auto</th>
-                                        <th title='Default value'>Default</th>
-                                        <th title='Comments' class="toggle"><span>Comments</span></th>
-                                    </tr>
-                                </thead>
-                                <tbody></tbody>
-                            </table>
-                        </div>
-                    </div>
-                </section>
-                <script>
-                    var tableData = [
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_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_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s location.<\/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,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "business_phone_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The phone number of a client&rsquo;s specific location.<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_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_status_code",
-        "tableFileName": "submission_status_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "confirmed_match_userid",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The ID of the user submitting the changes.<\/p>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_matching_detail_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_matching_detail_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission matching detail of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "business_phone_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The phone number of the client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "confirmed_match_status_ind",
-        "type": "varchar",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>An indicator that determines whether a specific match has been approved, allowing the processing to continue, or denied, requiring immediate action to be taken during the submission process.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was last updated.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "execution_time",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "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": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_subject",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Subject of the email.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
-        "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": "business_type_code",
-        "tableFileName": "business_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "street_address",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The address of a client, including the street number and street name.<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "submission_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",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the natural resource district of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
-        "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_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": "province_code",
-        "tableFileName": "province_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_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "secondary_phone_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A secondary phone number of a client&rsquo;s specific location.<\/p>"
-    },
-    {
-        "tableName": "submission",
-        "tableFileName": "submission",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the country to which the ID type belongs. If the country code is populated, a province or state will be required.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_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",
-        "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>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "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": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created.<\/p>"
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 200,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission",
-        "tableFileName": "submission",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "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_country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "secondary_phone_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A secondary phone number of the client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "exception_message",
-        "type": "text",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Textual message describing any exceptions that occurred during email processing.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_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_status_code",
-        "tableFileName": "submission_status_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",
-        "tableFileName": "submission",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_status_code",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the status of a submission request.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "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": "province_code",
-        "tableFileName": "province_code",
-        "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": "contact_type_code",
-        "tableFileName": "contact_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",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "postal_code",
-        "type": "varchar",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "notes",
-        "type": "varchar",
-        "length": 4000,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Any additional information about the client or specific instructions.<\/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,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>contact_type_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a role of a client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
-        "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": "district_code",
-        "tableFileName": "district_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The email address of the Natural Resource District.<\/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": 4,
-        "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>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "confirmed_match_message",
-        "type": "varchar",
-        "length": 1000,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A field with the reason for the denial of the submission.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "create_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>Timestamp indicating when the email log entry was created.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_variables",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>JSONB field to store variables related to the email content.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "complementary_address_1",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A complementary address line of a client<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "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_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>submission_contact_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for the contact details of a client.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_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": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "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_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "organization_name",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The name of the client.<\/p>"
-    },
-    {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "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": "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": "√",
-        "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>"
-    },
-    {
-        "tableName": "submission",
-        "tableFileName": "submission",
-        "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_type_code",
-        "tableFileName": "submission_type_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_type_code",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the type of a submission request.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "submission_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",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the type of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_type_code",
-        "type": "varchar",
-        "length": 4,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code indicating the identification type of a client.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
-        "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": "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": "district_code",
-        "tableFileName": "district_code",
-        "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_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "work_safe_bc_number",
-        "type": "varchar",
-        "length": 6,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A Work Safe BC number of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_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": "business_type_code",
-        "tableFileName": "business_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "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": "district_code",
-        "tableFileName": "district_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": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>installed_rank",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "matching_fields",
-        "type": "jsonb",
-        "length": 2147483647,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A JSON object provides information about matches found in the existing database. The matches can result from fuzzy search, like matching a name pattern, or from exact equality, such as matching incorporation number or good standing status.<\/p>"
-    },
-    {
-        "tableName": "submission",
-        "tableFileName": "submission",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "submission_date",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The date and time the record was created.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_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": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "version",
-        "type": "varchar",
-        "length": 50,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_location_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.submission_location_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
-    },
-    {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "fax_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The fax number of the client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "client_acronym",
-        "type": "varchar",
-        "length": 8,
-        "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>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "city_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The name of the city of the location.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "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": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "script",
-        "type": "varchar",
-        "length": 1000,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "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": "business_type_code",
-        "tableFileName": "business_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>identification_province_code",
-        "type": "varchar",
-        "length": 4,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "submission_matching_processed",
-        "type": "bool",
-        "length": 1,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "false",
-        "comments": "<p>A flag to indicate that the submission was finally processed.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>province_code",
-        "type": "varchar",
-        "length": 4,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a province, state, department or territory.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the country in which the province is located.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "checksum",
-        "type": "int4",
-        "length": 10,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "installed_on",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "now()",
-        "comments": ""
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
-        "type": "varchar",
-        "length": 1,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.<\/p>"
-    },
-    {
-        "tableName": "client_type_code",
-        "tableFileName": "client_type_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>client_type_code",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the type of a client.<\/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,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The first name of the client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "complementary_address_2",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A second complementary address line of a client<\/p>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "submission_matching_processed_time",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The timestamp of when the processor started to process this specific entry<\/p>"
-    },
-    {
-        "tableName": "identification_type_code",
-        "tableFileName": "identification_type_code",
-        "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": "client_type_code",
-        "tableFileName": "client_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_status_code",
-        "tableFileName": "submission_status_code",
-        "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": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "doing_business_as",
-        "type": "varchar",
-        "length": 120,
-        "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>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "confirmed_match_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The timestamp when the changes happened.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Email address to which the email is sent.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "fax_number",
-        "type": "varchar",
-        "length": 14,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The fax number of a client&rsquo;s specific location.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "business_type_code",
-        "tableFileName": "business_type_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>business_type_code",
-        "type": "varchar",
-        "length": 1,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code indicating the business type of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "incorporation_number",
-        "type": "varchar",
-        "length": 13,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process.<\/p>"
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_id",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Identifier for the associated email assigned by CHES (if applicable).<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "good_standing_ind",
-        "type": "varchar",
-        "length": 1,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>An indicator that determines whether a client is in good standing with respect to their financial obligations.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "type",
-        "type": "varchar",
-        "length": 20,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "first_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The first name of the client.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "middle_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The middle name of the client.<\/p>"
-    },
-    {
-        "tableName": "contact_type_code",
-        "tableFileName": "contact_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_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "email_address",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The email address of the client&rsquo;s contact.<\/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_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "idp_user_id",
-        "type": "varchar",
-        "length": 50,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The unique identifier assigned to a user by the Identity Provider.<\/p>"
-    },
-    {
-        "tableName": "business_type_code",
-        "tableFileName": "business_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": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>email_log_id",
-        "type": "serial",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "√",
-        "defaultValue": "nextval('nrfc.email_log_id_seq'::regclass)",
-        "comments": "<p>Incremental id generated for a submission email log.<\/p>"
-    },
-    {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The last name of the client.<\/p>"
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "notes",
-        "type": "varchar",
-        "length": 4000,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Any additional information about the client&rsquo;s location or specific instructions for contacting them.<\/p>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "birthdate",
-        "type": "date",
-        "length": 13,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The date that the BC Services Card logged in person was born.<\/p>"
-    },
-    {
-        "tableName": "flyway_schema_history",
-        "tableFileName": "flyway_schema_history",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "installed_by",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "submission_location",
-        "tableFileName": "submission_location",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "location_name",
-        "type": "varchar",
-        "length": 40,
-        "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>"
-    },
-    {
-        "tableName": "submission_status_code",
-        "tableFileName": "submission_status_code",
-        "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": "contact_type_code",
-        "tableFileName": "contact_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    },
-    {
-        "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": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "client_number",
-        "type": "varchar",
-        "length": 8,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": ""
-    },
-    {
-        "tableName": "email_log",
-        "tableFileName": "email_log",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "template_name",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Name of the email template used for sending the email.<\/p>"
-    },
-    {
-        "tableName": "province_code",
-        "tableFileName": "province_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "display_order",
-        "type": "int4",
-        "length": 10,
-        "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>"
-    },
-    {
-        "tableName": "submission_matching_detail",
-        "tableFileName": "submission_matching_detail",
-        "tableType": "Table",
-        "keyClass": "foreignKey",
-        "keyTitle": "Foreign Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>submission_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>country_code",
-        "type": "varchar",
-        "length": 2,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a country.<\/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>submission_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a submission of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_user",
-        "type": "varchar",
-        "length": 60,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The user or proxy account that created or last updated the record.<\/p>"
-    },
-    {
-        "tableName": "submission_location_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>submission_location_id",
-        "type": "int4",
-        "length": 10,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>Incremental id generated for a location of a client.<\/p>"
-    },
-    {
-        "tableName": "submission_contact",
-        "tableFileName": "submission_contact",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "last_name",
-        "type": "varchar",
-        "length": 30,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The last name of the client&rsquo;s contact.<\/p>"
-    },
-    {
-        "tableName": "district_code",
-        "tableFileName": "district_code",
-        "tableType": "Table",
-        "keyClass": "primaryKey",
-        "keyTitle": "Primary Key",
-        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>district_code",
-        "type": "varchar",
-        "length": 5,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>A code representing the code of a Natural Resource District.<\/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>"
-    },
-    {
-        "tableName": "submission_detail",
-        "tableFileName": "submission_detail",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "client_identification",
-        "type": "varchar",
-        "length": 40,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The reference number that identifies a client.<\/p>"
-    },
-    {
-        "tableName": "country_code",
-        "tableFileName": "country_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "description",
-        "type": "varchar",
-        "length": 100,
-        "nullable": "",
-        "autoUpdated": "",
-        "defaultValue": "null",
-        "comments": "<p>The description of the code value.<\/p>"
-    },
-    {
-        "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>"
-    },
-    {
-        "tableName": "submission_type_code",
-        "tableFileName": "submission_type_code",
-        "tableType": "Table",
-        "keyClass": "",
-        "keyTitle": "",
-        "name": "update_timestamp",
-        "type": "timestamp",
-        "length": 29,
-        "nullable": "√",
-        "autoUpdated": "",
-        "defaultValue": "CURRENT_TIMESTAMP",
-        "comments": "<p>The date and time the record was created or last updated.<\/p>"
-    }
-];
-                    var config = {
-                        pagination: true
-                    };
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="bower/pdfmake/pdfmake.min.js"></script>
-        <script src="bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="bower/codemirror/codemirror.js"></script>
-        <script src="bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="column.js"></script>
-        <script src="schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/constraints.html b/schema/nrfc/constraints.html
deleted file mode 100644
index e9abf69819..0000000000
--- a/schema/nrfc/constraints.html
+++ /dev/null
@@ -1,512 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="bower/html5shiv/html5shiv.min.js"></script>
-        <script src="bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>Constraints</h1>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="ion ion-key"></i>
-                            <h3 class="box-title">17 Foreign Key Constraints</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="fk_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="50"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                    <tr>
-                                        <th>Constraint Name</th>
-                                        <th>Child Column</th>
-                                        <th>Parent Column</th>
-                                        <th>Delete Rule</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>submission_contact_contact_type_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_contact.html'>submission_contact</a><span>.contact_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/contact_type_code.html'>contact_type_code</a><span>.contact_type_code</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>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_contact.html'>submission_contact</a><span>.submission_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>
-                                                </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>
-                                            <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>
-                                                </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>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <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>
-                                            <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>
-                                                </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>
-                                                </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>
-                                            <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>
-                                                </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>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
-                                    </tr>
-                                    <tr>
-                                        <td>submission_submission_status_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission.html'>submission</a><span>.submission_status_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_status_code.html'>submission_status_code</a><span>.submission_status_code</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_submission_type_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission.html'>submission</a><span>.submission_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_type_code.html'>submission_type_code</a><span>.submission_type_code</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_country_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.country_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/country_code.html'>country_code</a><span>.country_code</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_province_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.country_code</span></td>
-                                                </tr>
-                                                <tr>
-                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.province_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/province_code.html'>province_code</a><span>.country_code</span></td>
-                                                </tr>
-                                                <tr>
-                                                    <td><a href='tables/province_code.html'>province_code</a><span>.province_code</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>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_location.html'>submission_location</a><span>.submission_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>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
-                                    </tr>
-                                    <tr>
-                                        <td>province_code_country_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/province_code.html'>province_code</a><span>.country_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/country_code.html'>country_code</a><span>.country_code</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_detail_district_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.district_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/district_code.html'>district_code</a><span>.district_code</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_detail_client_type_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.client_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/client_type_code.html'>client_type_code</a><span>.client_type_code</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>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.submission_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>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
-                                    </tr>
-                                    <tr>
-                                        <td>submission_detail_business_type_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.business_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/business_type_code.html'>business_type_code</a><span>.business_type_code</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>province_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.identification_country_code</span></td>
-                                                </tr>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.identification_province_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/province_code.html'>province_code</a><span>.country_code</span></td>
-                                                </tr>
-                                                <tr>
-                                                    <td><a href='tables/province_code.html'>province_code</a><span>.province_code</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>identification_type_code_fk</td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/submission_detail.html'>submission_detail</a><span>.identification_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table border='0' cellspacing='0' cellpadding='0'>
-                                                <tr>
-                                                    <td><a href='tables/identification_type_code.html'>identification_type_code</a><span>.identification_type_code</span></td>
-                                                </tr>
-                                            </table>
-                                        </td>
-                                        <td><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>Restrict delete</span></td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 class="box-title">Check Constraints</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="check_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                    <tr>
-                                        <th>Table</th>
-                                        <th>Constraint Name</th>
-                                        <th>Constraint</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="bower/pdfmake/pdfmake.min.js"></script>
-        <script src="bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="bower/codemirror/codemirror.js"></script>
-        <script src="bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="constraint.js"></script>
-        <script src="schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/default.nrfc.xml b/schema/nrfc/default.nrfc.xml
deleted file mode 100644
index bb3919e687..0000000000
--- a/schema/nrfc/default.nrfc.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><database name="default" schema="nrfc" type="PostgreSQL - 16.4 (Debian 16.4-1.pgdg110+2)">
-   <sequences>
-      <sequence increment="1" name="email_log_id_seq" startValue="1"/>
-      <sequence increment="1" name="submission_contact_seq" startValue="1"/>
-      <sequence increment="1" name="submission_detail_id_seq" startValue="1"/>
-      <sequence increment="1" name="submission_id_seq" startValue="1"/>
-      <sequence increment="1" name="submission_location_seq" startValue="1"/>
-      <sequence increment="1" name="submission_matching_detail_id_seq" startValue="1"/>
-   </sequences>
-   <tables>
-      <table name="business_type_code" remarks="A code indicating the business type of a client. It could be either Registered Business and Unregistered Business." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="business_type_code" nullable="false" remarks="A code indicating the business type of a client." size="1" type="varchar" typeCode="12">
-            <child column="business_type_code" foreignKey="submission_detail_business_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="business_type_code" sequenceNumberInPK="1"/>
-         <index name="business_type_code_pk" unique="true">
-            <column ascending="true" name="business_type_code"/>
-         </index>
-      </table>
-      <table name="client_type_code" remarks="A code indicating the type of a client. Examples include, but are not limited to: Corporation, Individual, Association, and others." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="client_type_code" nullable="false" remarks="A code representing the type of a client." size="5" type="varchar" typeCode="12">
-            <child column="client_type_code" foreignKey="submission_detail_client_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="client_type_code" sequenceNumberInPK="1"/>
-         <index name="client_type_code_pk" unique="true">
-            <column ascending="true" name="client_type_code"/>
-         </index>
-      </table>
-      <table name="contact_type_code" remarks="A code indicating the role of a contact of a client." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="contact_type_code" nullable="false" remarks="A code representing the code of a role of a client's contact." size="2" type="varchar" typeCode="12">
-            <child column="contact_type_code" foreignKey="submission_contact_contact_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_contact"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="contact_type_code" sequenceNumberInPK="1"/>
-         <index name="contact_type_code_pk" unique="true">
-            <column ascending="true" name="contact_type_code"/>
-         </index>
-      </table>
-      <table name="country_code" remarks="A list of countries, serving as a reference for country-specific data." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="country_code" nullable="false" remarks="A code representing the code of a country." size="2" type="varchar" typeCode="12">
-            <child column="country_code" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" schema="nrfc" table="identification_type_code"/>
-            <child column="country_code" foreignKey="province_code_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
-            <child column="country_code" foreignKey="submission_location_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="display_order" nullable="true" remarks="The the display order of a country. If no value is provided, the application will order countries alphabetically by default." size="10" type="int4" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="6" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="country_code" sequenceNumberInPK="1"/>
-         <index name="country_code_pk" unique="true">
-            <column ascending="true" name="country_code"/>
-         </index>
-         <index name="display_order_uk" unique="true">
-            <column ascending="true" name="display_order"/>
-         </index>
-      </table>
-      <table name="district_code" remarks="A list of Natural Resource Districts." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="district_code" nullable="false" remarks="A code representing the code of a Natural Resource District." size="5" type="varchar" typeCode="12">
-            <child column="district_code" foreignKey="submission_detail_district_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="email_address" nullable="false" remarks="The email address of the Natural Resource District." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="4" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="6" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="district_code" sequenceNumberInPK="1"/>
-         <index name="district_code_pk" unique="true">
-            <column ascending="true" name="district_code"/>
-         </index>
-      </table>
-      <table name="email_log" remarks="Stores email log information" schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.email_log_id_seq'::regclass)" digits="0" id="0" name="email_log_id" nullable="false" remarks="Incremental id generated for a submission email log." size="10" type="serial" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="email_id" nullable="true" remarks="Identifier for the associated email assigned by CHES (if applicable)." size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="email_sent_ind" nullable="true" remarks="Indicator for whether the email has been sent ('Y' for Yes, 'N' for No)." size="1" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="exception_message" nullable="true" remarks="Textual message describing any exceptions that occurred during email processing." size="2147483647" type="text" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="template_name" nullable="false" remarks="Name of the email template used for sending the email." size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="email_address" nullable="false" remarks="Email address to which the email is sent." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="email_subject" nullable="false" remarks="Subject of the email." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="email_variables" nullable="true" remarks="JSONB field to store variables related to the email content." size="2147483647" type="jsonb" typeCode="1111"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="8" name="create_timestamp" nullable="false" remarks="Timestamp indicating when the email log entry was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="9" name="update_timestamp" nullable="true" remarks="Timestamp indicating when the email log entry was last updated." size="29" type="timestamp" typeCode="93"/>
-         <primaryKey column="email_log_id" sequenceNumberInPK="1"/>
-         <index name="email_log_id_pk" unique="true">
-            <column ascending="true" name="email_log_id"/>
-         </index>
-      </table>
-      <table name="flyway_schema_history" remarks="" schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="installed_rank" nullable="false" remarks="" size="10" type="int4" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="version" nullable="true" remarks="" size="50" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="description" nullable="false" remarks="" size="200" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="type" nullable="false" remarks="" size="20" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="script" nullable="false" remarks="" size="1000" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="checksum" nullable="true" remarks="" size="10" type="int4" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="installed_by" nullable="false" remarks="" size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="now()" digits="6" id="7" name="installed_on" nullable="false" remarks="" size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="execution_time" nullable="false" remarks="" size="10" type="int4" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="success" nullable="false" remarks="" size="1" type="bool" typeCode="-7"/>
-         <primaryKey column="installed_rank" sequenceNumberInPK="1"/>
-         <index name="flyway_schema_history_pk" unique="true">
-            <column ascending="true" name="installed_rank"/>
-         </index>
-         <index name="flyway_schema_history_s_idx" unique="false">
-            <column ascending="true" name="success"/>
-         </index>
-      </table>
-      <table name="identification_type_code" remarks="" schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="identification_type_code" nullable="false" remarks="A code indicating the identification type of a client. Examples of possible ID types include Canadian Birth Certificate, Canadian Passport, and others." size="4" type="varchar" typeCode="12">
-            <child column="identification_type_code" foreignKey="identification_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="country_code" nullable="true" remarks="A code representing the country to which the ID type belongs. If the country code is populated, a province or state will be required." size="2" type="varchar" typeCode="12">
-            <parent column="country_code" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" schema="nrfc" table="country_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="4" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="6" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="identification_type_code" sequenceNumberInPK="1"/>
-         <index name="identification_type_code_pk" unique="true">
-            <column ascending="true" name="identification_type_code"/>
-         </index>
-      </table>
-      <table name="province_code" remarks="A list of provinces, states, departments or territories, serving as a reference for province-specific data." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="province_code" nullable="false" remarks="A code representing the code of a province, state, department or territory." size="4" type="varchar" typeCode="12">
-            <child column="identification_province_code" foreignKey="province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-            <child column="province_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="country_code" nullable="false" remarks="A code representing the country in which the province is located." size="2" type="varchar" typeCode="12">
-            <child column="identification_country_code" foreignKey="province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-            <child column="country_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location"/>
-            <parent column="country_code" foreignKey="province_code_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="country_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="4" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="6" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="display_order" nullable="true" remarks="The the display order of a province/state. If no value is provided, the application will order provinces/states alphabetically by default." size="10" type="int4" typeCode="4"/>
-         <primaryKey column="country_code" sequenceNumberInPK="1"/>
-         <primaryKey column="province_code" sequenceNumberInPK="2"/>
-         <index name="province_code_pk" unique="true">
-            <column ascending="true" name="country_code"/>
-            <column ascending="true" name="province_code"/>
-         </index>
-      </table>
-      <table name="submission" remarks="A submission request to create a client." schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.submission_id_seq'::regclass)" digits="0" id="0" name="submission_id" nullable="false" remarks="Incremental id generated for a submission of a client." size="10" type="serial" typeCode="4">
-            <child column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_contact"/>
-            <child column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_detail"/>
-            <child column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location"/>
-            <child column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_matching_detail"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_status_code" nullable="true" remarks="TBD." size="5" type="varchar" typeCode="12">
-            <parent column="submission_status_code" foreignKey="submission_submission_status_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_status_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="submission_type_code" nullable="true" remarks="A code indicating the status of a submission request. Examples include, but are not limited to: New, Approved, Rejected, and others." size="5" type="varchar" typeCode="12">
-            <parent column="submission_type_code" foreignKey="submission_submission_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_type_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="6" id="3" name="submission_date" nullable="true" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="submission_id" sequenceNumberInPK="1"/>
-         <index name="submission_pk" unique="true">
-            <column ascending="true" name="submission_id"/>
-         </index>
-      </table>
-      <table name="submission_contact" remarks="The details of a contacts for each client's location." schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.submission_contact_seq'::regclass)" digits="0" id="0" name="submission_contact_id" nullable="false" remarks="Incremental id generated for the contact details of a client." size="10" type="serial" typeCode="4">
-            <child column="submission_contact_id" foreignKey="submission_contact_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location_contact_xref"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_id" nullable="false" remarks="Incremental id generated for a submission of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="contact_type_code" nullable="false" remarks="A code representing the code of a role of a client's contact." size="2" type="varchar" typeCode="12">
-            <parent column="contact_type_code" foreignKey="submission_contact_contact_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="contact_type_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="first_name" nullable="true" remarks="The first name of the client's contact." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="last_name" nullable="true" remarks="The last name of the client's contact." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="business_phone_number" nullable="false" remarks="The phone number of the client's contact." size="14" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="email_address" nullable="false" remarks="The email address of the client's contact." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="idp_user_id" nullable="true" remarks="The unique identifier assigned to a user by the Identity Provider." size="50" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="secondary_phone_number" nullable="true" remarks="A secondary phone number of the client's contact." size="14" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="fax_number" nullable="true" remarks="The fax number of the client's contact." size="14" type="varchar" typeCode="12"/>
-         <primaryKey column="submission_contact_id" sequenceNumberInPK="1"/>
-         <index name="submission_contact_id_pk" unique="true">
-            <column ascending="true" name="submission_contact_id"/>
-         </index>
-      </table>
-      <table name="submission_detail" remarks="The details of a submission request to create a client." schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.submission_detail_id_seq'::regclass)" digits="0" id="0" name="submission_detail_id" nullable="false" remarks="Incremental id generated for a submission detail of a client." size="10" type="serial" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_id" nullable="false" remarks="Incremental id generated for a submission of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="client_number" nullable="true" remarks="" size="8" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="business_type_code" nullable="false" remarks="A code indicating the business type of a client. It could be either Registered Business and Unregistered Business." size="1" type="varchar" typeCode="12">
-            <parent column="business_type_code" foreignKey="submission_detail_business_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="business_type_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="incorporation_number" nullable="true" remarks="A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process." size="13" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="organization_name" nullable="true" remarks="The name of the client." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="client_type_code" nullable="false" remarks="A code representing the type of a client." size="5" type="varchar" typeCode="12">
-            <parent column="client_type_code" foreignKey="submission_detail_client_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="client_type_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="good_standing_ind" nullable="true" remarks="An indicator that determines whether a client is in good standing with respect to their financial obligations." size="1" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="birthdate" nullable="true" remarks="The date that the BC Services Card logged in person was born." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="district_code" nullable="true" remarks="A code representing the natural resource district of a client." size="5" type="varchar" typeCode="12">
-            <parent column="district_code" foreignKey="submission_detail_district_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="district_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="10" name="work_safe_bc_number" nullable="true" remarks="A Work Safe BC number of a client." size="6" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="11" name="doing_business_as" nullable="true" remarks="An alternate name that a client may be conducting business under. For example: John Smith doing business as: John's Logging." size="120" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="12" name="client_acronym" nullable="true" remarks="A familiar alphabetic acronym to be used as an alternative to the ministry's client number for data entry and display." size="8" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="13" name="first_name" nullable="true" remarks="The first name of the client." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="14" name="middle_name" nullable="true" remarks="The middle name of the client." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="15" name="last_name" nullable="true" remarks="The last name of the client." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="16" name="notes" nullable="true" remarks="Any additional information about the client or specific instructions." size="4000" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="17" name="identification_type_code" nullable="true" remarks="A code indicating the identification type of a client." size="4" type="varchar" typeCode="12">
-            <parent column="identification_type_code" foreignKey="identification_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="identification_type_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="18" name="client_identification" nullable="true" remarks="The reference number that identifies a client." size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="19" name="identification_country_code" nullable="true" remarks="A code representing the code of a country." size="2" type="varchar" typeCode="12">
-            <parent column="country_code" foreignKey="province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="20" name="identification_province_code" nullable="true" remarks="A code representing the code of a province, state, department or territory." size="4" type="varchar" typeCode="12">
-            <parent column="province_code" foreignKey="province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
-         </column>
-         <primaryKey column="submission_detail_id" sequenceNumberInPK="1"/>
-         <index name="submission_detail_id_pk" unique="true">
-            <column ascending="true" name="submission_detail_id"/>
-         </index>
-      </table>
-      <table name="submission_location" remarks="The details of a client's location." schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.submission_location_seq'::regclass)" digits="0" id="0" name="submission_location_id" nullable="false" remarks="Incremental id generated for a location of a client." size="10" type="serial" typeCode="4">
-            <child column="submission_location_id" foreignKey="submission_location_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location_contact_xref"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_id" nullable="false" remarks="Incremental id generated for a submission of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="street_address" nullable="false" remarks="The address of a client, including the street number and street name." size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="country_code" nullable="false" remarks="A code representing the code of a country." size="2" type="varchar" typeCode="12">
-            <parent column="country_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
-            <parent column="country_code" foreignKey="submission_location_country_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="country_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="province_code" nullable="false" remarks="A code representing the code of a province, state, department or territory." size="2" type="varchar" typeCode="12">
-            <parent column="province_code" foreignKey="submission_location_province_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="province_code"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="city_name" nullable="false" remarks="The name of the city of the location." size="30" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="postal_code" nullable="false" remarks="" size="10" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="location_name" nullable="false" remarks="The location name of an address. Examples of location names include, but are not limited to, Mailing Address, Billing Address among others." size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="business_phone_number" nullable="true" remarks="The phone number of a client's specific location." size="14" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="secondary_phone_number" nullable="true" remarks="A secondary phone number of a client's specific location." size="14" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="10" name="fax_number" nullable="true" remarks="The fax number of a client's specific location." size="14" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="11" name="notes" nullable="true" remarks="Any additional information about the client's location or specific instructions for contacting them." size="4000" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="12" name="complementary_address_1" nullable="true" remarks="A complementary address line of a client" size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="13" name="complementary_address_2" nullable="true" remarks="A second complementary address line of a client" size="40" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="14" name="email_address" nullable="true" remarks="The email address of the client's location." size="100" type="varchar" typeCode="12"/>
-         <primaryKey column="submission_location_id" sequenceNumberInPK="1"/>
-         <index name="submission_location_id_pk" unique="true">
-            <column ascending="true" name="submission_location_id"/>
-         </index>
-      </table>
-      <table name="submission_location_contact_xref" remarks="Identifies the multiple addresses for a given client, as well as the many contacts that may belong to a given address." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="submission_location_id" nullable="false" remarks="Incremental id generated for a location of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_location_id" foreignKey="submission_location_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_location"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_contact_id" nullable="false" remarks="Incremental id generated for the contact details of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_contact_id" foreignKey="submission_contact_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission_contact"/>
-         </column>
-         <primaryKey column="submission_location_id" sequenceNumberInPK="1"/>
-         <primaryKey column="submission_contact_id" sequenceNumberInPK="2"/>
-         <index name="submission_location_contact_xref_id_pk" unique="true">
-            <column ascending="true" name="submission_location_id"/>
-            <column ascending="true" name="submission_contact_id"/>
-         </index>
-      </table>
-      <table name="submission_matching_detail" remarks="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." schema="nrfc" type="TABLE">
-         <column autoUpdated="true" defaultValue="nextval('nrfc.submission_matching_detail_id_seq'::regclass)" digits="0" id="0" name="submission_matching_detail_id" nullable="false" remarks="Incremental id generated for a submission matching detail of a client." size="10" type="serial" typeCode="4"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="submission_id" nullable="false" remarks="Incremental id generated for a submission of a client." size="10" type="int4" typeCode="4">
-            <parent column="submission_id" foreignKey="submission_id_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="matching_fields" nullable="true" remarks="A JSON object provides information about matches found in the existing database. The matches can result from fuzzy search, like matching a name pattern, or from exact equality, such as matching incorporation number or good standing status." size="2147483647" type="jsonb" typeCode="1111"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="confirmed_match_status_ind" nullable="true" remarks="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." size="1" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="confirmed_match_message" nullable="true" remarks="A field with the reason for the denial of the submission." size="1000" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="6" id="5" name="confirmed_match_timestamp" nullable="true" remarks="The timestamp when the changes happened." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="confirmed_match_userid" nullable="true" remarks="The ID of the user submitting the changes." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="false" digits="0" id="7" name="submission_matching_processed" nullable="false" remarks="A flag to indicate that the submission was finally processed." size="1" type="bool" typeCode="-7"/>
-         <column autoUpdated="false" defaultValue="null" digits="6" id="8" name="submission_matching_processed_time" nullable="true" remarks="The timestamp of when the processor started to process this specific entry" size="29" type="timestamp" typeCode="93"/>
-         <primaryKey column="submission_matching_detail_id" sequenceNumberInPK="1"/>
-         <index name="submission_matching_detail_id_pk" unique="true">
-            <column ascending="true" name="submission_matching_detail_id"/>
-         </index>
-      </table>
-      <table name="submission_status_code" remarks="A code indicating the status of a client creation submission request. Examples of possible statuses include Approved, Rejected, and others." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="submission_status_code" nullable="false" remarks="A code representing the status of a submission request." size="5" type="varchar" typeCode="12">
-            <child column="submission_status_code" foreignKey="submission_submission_status_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="submission_status_code" sequenceNumberInPK="1"/>
-         <index name="submission_status_code_pk" unique="true">
-            <column ascending="true" name="submission_status_code"/>
-         </index>
-      </table>
-      <table name="submission_type_code" remarks="A code indicating the type of a submission request. Examples of possible type are TBD." schema="nrfc" type="TABLE">
-         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="submission_type_code" nullable="false" remarks="A code representing the type of a submission request." size="5" type="varchar" typeCode="12">
-            <child column="submission_type_code" foreignKey="submission_submission_type_code_fk" implied="false" onDeleteCascade="false" schema="nrfc" table="submission"/>
-         </column>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="description" nullable="false" remarks="The description of the code value." size="100" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="effective_date" nullable="false" remarks="The date that the code value has become or is expected to become effective. Default is the data that the code value is created." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="to_date('99991231'::text, 'YYYYMMDD'::text)" digits="0" id="3" name="expiry_date" nullable="false" remarks="The date on which the code value has expired or is expected to expire.  Default 9999-12-31." size="13" type="date" typeCode="91"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="4" name="create_timestamp" nullable="false" remarks="The date and time the record was created." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="CURRENT_TIMESTAMP" digits="6" id="5" name="update_timestamp" nullable="true" remarks="The date and time the record was created or last updated." size="29" type="timestamp" typeCode="93"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="create_user" nullable="false" remarks="The user or proxy account that created the record." size="60" type="varchar" typeCode="12"/>
-         <column autoUpdated="false" defaultValue="null" digits="0" id="7" name="update_user" nullable="true" remarks="The user or proxy account that created or last updated the record." size="60" type="varchar" typeCode="12"/>
-         <primaryKey column="submission_type_code" sequenceNumberInPK="1"/>
-         <index name="submission_type_code_pk" unique="true">
-            <column ascending="true" name="submission_type_code"/>
-         </index>
-      </table>
-   </tables>
-</database>
diff --git a/schema/nrfc/deletionOrder.txt b/schema/nrfc/deletionOrder.txt
deleted file mode 100644
index 44d27b6609..0000000000
--- a/schema/nrfc/deletionOrder.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-flyway_schema_history
-email_log
-submission_detail
-submission_location_contact_xref
-submission_matching_detail
-submission_location
-submission_contact
-identification_type_code
-submission
-province_code
-submission_type_code
-submission_status_code
-district_code
-contact_type_code
-client_type_code
-business_type_code
-country_code
diff --git a/schema/nrfc/diagrams/orphans/orphans.png b/schema/nrfc/diagrams/orphans/orphans.png
deleted file mode 100644
index c3da241b12..0000000000
Binary files a/schema/nrfc/diagrams/orphans/orphans.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.compact.dot b/schema/nrfc/diagrams/summary/relationships.implied.compact.dot
deleted file mode 100644
index 07c0c38ca7..0000000000
--- a/schema/nrfc/diagrams/summary/relationships.implied.compact.dot
+++ /dev/null
@@ -1,221 +0,0 @@
-digraph "compactImpliedRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_matching_detail.html"
-    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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-}
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.compact.png b/schema/nrfc/diagrams/summary/relationships.implied.compact.png
deleted file mode 100644
index 0de0dff225..0000000000
Binary files a/schema/nrfc/diagrams/summary/relationships.implied.compact.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.large.dot b/schema/nrfc/diagrams/summary/relationships.implied.large.dot
deleted file mode 100644
index 92dfde483d..0000000000
--- a/schema/nrfc/diagrams/summary/relationships.implied.large.dot
+++ /dev/null
@@ -1,314 +0,0 @@
-digraph "largeImpliedRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">first_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">last_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="idp_user_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">idp_user_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">fax_number</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">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="matching_fields" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">matching_fields</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_status_ind" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_status_ind</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_message" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_message</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_userid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_userid</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_processed" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_processed_time" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed_time</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_matching_detail.html"
-    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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</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">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="notes" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="notes" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-}
diff --git a/schema/nrfc/diagrams/summary/relationships.implied.large.png b/schema/nrfc/diagrams/summary/relationships.implied.large.png
deleted file mode 100644
index 8a01f03cbd..0000000000
Binary files a/schema/nrfc/diagrams/summary/relationships.implied.large.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/summary/relationships.real.compact.dot b/schema/nrfc/diagrams/summary/relationships.real.compact.dot
deleted file mode 100644
index 0e86db0cd0..0000000000
--- a/schema/nrfc/diagrams/summary/relationships.real.compact.dot
+++ /dev/null
@@ -1,220 +0,0 @@
-digraph "compactRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_matching_detail.html"
-    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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-}
diff --git a/schema/nrfc/diagrams/summary/relationships.real.compact.png b/schema/nrfc/diagrams/summary/relationships.real.compact.png
deleted file mode 100644
index 3766c09a1d..0000000000
Binary files a/schema/nrfc/diagrams/summary/relationships.real.compact.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/summary/relationships.real.large.dot b/schema/nrfc/diagrams/summary/relationships.real.large.dot
deleted file mode 100644
index fadd9d269e..0000000000
--- a/schema/nrfc/diagrams/summary/relationships.real.large.dot
+++ /dev/null
@@ -1,313 +0,0 @@
-digraph "largeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">first_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">last_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="idp_user_id" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">idp_user_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">fax_number</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">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="matching_fields" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">matching_fields</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_status_ind" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_status_ind</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_message" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_message</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="confirmed_match_userid" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_userid</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_processed" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_processed_time" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed_time</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_matching_detail.html"
-    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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</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">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="notes" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">email_address</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="notes" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="tables/submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="description" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="3" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-}
diff --git a/schema/nrfc/diagrams/summary/relationships.real.large.png b/schema/nrfc/diagrams/summary/relationships.real.large.png
deleted file mode 100644
index 0a8802fa6b..0000000000
Binary files a/schema/nrfc/diagrams/summary/relationships.real.large.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/business_type_code.1degree.dot b/schema/nrfc/diagrams/tables/business_type_code.1degree.dot
deleted file mode 100644
index 4cbe9d7d1b..0000000000
--- a/schema/nrfc/diagrams/tables/business_type_code.1degree.dot
+++ /dev/null
@@ -1,41 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/business_type_code.1degree.png b/schema/nrfc/diagrams/tables/business_type_code.1degree.png
deleted file mode 100644
index 0b2e92449f..0000000000
Binary files a/schema/nrfc/diagrams/tables/business_type_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/business_type_code.2degrees.dot b/schema/nrfc/diagrams/tables/business_type_code.2degrees.dot
deleted file mode 100644
index 9206eefbff..0000000000
--- a/schema/nrfc/diagrams/tables/business_type_code.2degrees.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="116" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/business_type_code.2degrees.png b/schema/nrfc/diagrams/tables/business_type_code.2degrees.png
deleted file mode 100644
index c637be401c..0000000000
Binary files a/schema/nrfc/diagrams/tables/business_type_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/client_type_code.1degree.dot b/schema/nrfc/diagrams/tables/client_type_code.1degree.dot
deleted file mode 100644
index d2cdfab2b5..0000000000
--- a/schema/nrfc/diagrams/tables/client_type_code.1degree.dot
+++ /dev/null
@@ -1,41 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "client_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/client_type_code.1degree.png b/schema/nrfc/diagrams/tables/client_type_code.1degree.png
deleted file mode 100644
index 3dd7a37fb4..0000000000
Binary files a/schema/nrfc/diagrams/tables/client_type_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/client_type_code.2degrees.dot b/schema/nrfc/diagrams/tables/client_type_code.2degrees.dot
deleted file mode 100644
index 614cf7446a..0000000000
--- a/schema/nrfc/diagrams/tables/client_type_code.2degrees.dot
+++ /dev/null
@@ -1,102 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/client_type_code.2degrees.png b/schema/nrfc/diagrams/tables/client_type_code.2degrees.png
deleted file mode 100644
index 4c41469612..0000000000
Binary files a/schema/nrfc/diagrams/tables/client_type_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/contact_type_code.1degree.dot b/schema/nrfc/diagrams/tables/contact_type_code.1degree.dot
deleted file mode 100644
index 85a3320467..0000000000
--- a/schema/nrfc/diagrams/tables/contact_type_code.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "contact_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" COLSPAN="2" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD><TD PORT="contact_type_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/contact_type_code.1degree.png b/schema/nrfc/diagrams/tables/contact_type_code.1degree.png
deleted file mode 100644
index a35467722e..0000000000
Binary files a/schema/nrfc/diagrams/tables/contact_type_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/contact_type_code.2degrees.dot b/schema/nrfc/diagrams/tables/contact_type_code.2degrees.dot
deleted file mode 100644
index 12513c2ffb..0000000000
--- a/schema/nrfc/diagrams/tables/contact_type_code.2degrees.dot
+++ /dev/null
@@ -1,60 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "contact_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" COLSPAN="2" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD><TD PORT="contact_type_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/contact_type_code.2degrees.png b/schema/nrfc/diagrams/tables/contact_type_code.2degrees.png
deleted file mode 100644
index 70f7e4e9e7..0000000000
Binary files a/schema/nrfc/diagrams/tables/contact_type_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/country_code.1degree.dot b/schema/nrfc/diagrams/tables/country_code.1degree.dot
deleted file mode 100644
index 2142dd5803..0000000000
--- a/schema/nrfc/diagrams/tables/country_code.1degree.dot
+++ /dev/null
@@ -1,54 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/country_code.1degree.png b/schema/nrfc/diagrams/tables/country_code.1degree.png
deleted file mode 100644
index 134edee682..0000000000
Binary files a/schema/nrfc/diagrams/tables/country_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/country_code.2degrees.dot b/schema/nrfc/diagrams/tables/country_code.2degrees.dot
deleted file mode 100644
index c60efedbf6..0000000000
--- a/schema/nrfc/diagrams/tables/country_code.2degrees.dot
+++ /dev/null
@@ -1,86 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/country_code.2degrees.png b/schema/nrfc/diagrams/tables/country_code.2degrees.png
deleted file mode 100644
index 0fd2b52396..0000000000
Binary files a/schema/nrfc/diagrams/tables/country_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/country_code.implied1degrees.dot b/schema/nrfc/diagrams/tables/country_code.implied1degrees.dot
deleted file mode 100644
index a405ad7e8b..0000000000
--- a/schema/nrfc/diagrams/tables/country_code.implied1degrees.dot
+++ /dev/null
@@ -1,68 +0,0 @@
-digraph "oneDegreeRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/country_code.implied1degrees.png b/schema/nrfc/diagrams/tables/country_code.implied1degrees.png
deleted file mode 100644
index c3160eec32..0000000000
Binary files a/schema/nrfc/diagrams/tables/country_code.implied1degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/country_code.implied2degrees.dot b/schema/nrfc/diagrams/tables/country_code.implied2degrees.dot
deleted file mode 100644
index 597feadca3..0000000000
--- a/schema/nrfc/diagrams/tables/country_code.implied2degrees.dot
+++ /dev/null
@@ -1,101 +0,0 @@
-digraph "twoDegreesRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/country_code.implied2degrees.png b/schema/nrfc/diagrams/tables/country_code.implied2degrees.png
deleted file mode 100644
index f446eb24b0..0000000000
Binary files a/schema/nrfc/diagrams/tables/country_code.implied2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/district_code.1degree.dot b/schema/nrfc/diagrams/tables/district_code.1degree.dot
deleted file mode 100644
index 693ecf6809..0000000000
--- a/schema/nrfc/diagrams/tables/district_code.1degree.dot
+++ /dev/null
@@ -1,42 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"district_code":w -> "district_code":"district_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "district_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/district_code.1degree.png b/schema/nrfc/diagrams/tables/district_code.1degree.png
deleted file mode 100644
index f944c5b8a7..0000000000
Binary files a/schema/nrfc/diagrams/tables/district_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/district_code.2degrees.dot b/schema/nrfc/diagrams/tables/district_code.2degrees.dot
deleted file mode 100644
index aa5eb6f871..0000000000
--- a/schema/nrfc/diagrams/tables/district_code.2degrees.dot
+++ /dev/null
@@ -1,103 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/district_code.2degrees.png b/schema/nrfc/diagrams/tables/district_code.2degrees.png
deleted file mode 100644
index 4b34844cf9..0000000000
Binary files a/schema/nrfc/diagrams/tables/district_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/email_log.1degree.dot b/schema/nrfc/diagrams/tables/email_log.1degree.dot
deleted file mode 100644
index 03c1329192..0000000000
--- a/schema/nrfc/diagrams/tables/email_log.1degree.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "email_log" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16"><B>email_log</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_log_id" COLSPAN="2" 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="115" HEIGHT="16">email_log_id</TD></TR></TABLE></TD><TD PORT="email_log_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="email_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_id</TD></TR></TABLE></TD><TD PORT="email_id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_sent_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_sent_ind</TD></TR></TABLE></TD><TD PORT="email_sent_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="exception_message" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">exception_message</TD></TR></TABLE></TD><TD PORT="exception_message.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="template_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">template_name</TD></TR></TABLE></TD><TD PORT="template_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_subject" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_subject</TD></TR></TABLE></TD><TD PORT="email_subject.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_variables" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_variables</TD></TR></TABLE></TD><TD PORT="email_variables.type" ALIGN="LEFT">jsonb[2147483647]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="email_log.html"
-    target="_top"
-    tooltip="email_log"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/email_log.1degree.png b/schema/nrfc/diagrams/tables/email_log.1degree.png
deleted file mode 100644
index acf993509e..0000000000
Binary files a/schema/nrfc/diagrams/tables/email_log.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.1degree.dot b/schema/nrfc/diagrams/tables/identification_type_code.1degree.dot
deleted file mode 100644
index 6038eaa544..0000000000
--- a/schema/nrfc/diagrams/tables/identification_type_code.1degree.dot
+++ /dev/null
@@ -1,42 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "identification_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.1degree.png b/schema/nrfc/diagrams/tables/identification_type_code.1degree.png
deleted file mode 100644
index f9bb4ca7bc..0000000000
Binary files a/schema/nrfc/diagrams/tables/identification_type_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.2degrees.dot b/schema/nrfc/diagrams/tables/identification_type_code.2degrees.dot
deleted file mode 100644
index fcbd6c84ba..0000000000
--- a/schema/nrfc/diagrams/tables/identification_type_code.2degrees.dot
+++ /dev/null
@@ -1,103 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.2degrees.png b/schema/nrfc/diagrams/tables/identification_type_code.2degrees.png
deleted file mode 100644
index a21dbd0750..0000000000
Binary files a/schema/nrfc/diagrams/tables/identification_type_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.dot b/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.dot
deleted file mode 100644
index 68d405a87a..0000000000
--- a/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.dot
+++ /dev/null
@@ -1,56 +0,0 @@
-digraph "oneDegreeRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.png b/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.png
deleted file mode 100644
index 9c346488d1..0000000000
Binary files a/schema/nrfc/diagrams/tables/identification_type_code.implied1degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.dot b/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.dot
deleted file mode 100644
index 361947b60a..0000000000
--- a/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.dot
+++ /dev/null
@@ -1,133 +0,0 @@
-digraph "twoDegreesRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"elipses":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.png b/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.png
deleted file mode 100644
index 0c32ef0b48..0000000000
Binary files a/schema/nrfc/diagrams/tables/identification_type_code.implied2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/province_code.1degree.dot b/schema/nrfc/diagrams/tables/province_code.1degree.dot
deleted file mode 100644
index 355568e7fc..0000000000
--- a/schema/nrfc/diagrams/tables/province_code.1degree.dot
+++ /dev/null
@@ -1,76 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/province_code.1degree.png b/schema/nrfc/diagrams/tables/province_code.1degree.png
deleted file mode 100644
index 9d788f4e6c..0000000000
Binary files a/schema/nrfc/diagrams/tables/province_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/province_code.2degrees.dot b/schema/nrfc/diagrams/tables/province_code.2degrees.dot
deleted file mode 100644
index b9cfb0d449..0000000000
--- a/schema/nrfc/diagrams/tables/province_code.2degrees.dot
+++ /dev/null
@@ -1,143 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/province_code.2degrees.png b/schema/nrfc/diagrams/tables/province_code.2degrees.png
deleted file mode 100644
index fbbcc71e78..0000000000
Binary files a/schema/nrfc/diagrams/tables/province_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/province_code.implied1degrees.dot b/schema/nrfc/diagrams/tables/province_code.implied1degrees.dot
deleted file mode 100644
index 4a88259a07..0000000000
--- a/schema/nrfc/diagrams/tables/province_code.implied1degrees.dot
+++ /dev/null
@@ -1,76 +0,0 @@
-digraph "oneDegreeRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/province_code.implied1degrees.png b/schema/nrfc/diagrams/tables/province_code.implied1degrees.png
deleted file mode 100644
index 9d788f4e6c..0000000000
Binary files a/schema/nrfc/diagrams/tables/province_code.implied1degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/province_code.implied2degrees.dot b/schema/nrfc/diagrams/tables/province_code.implied2degrees.dot
deleted file mode 100644
index 387348dcb3..0000000000
--- a/schema/nrfc/diagrams/tables/province_code.implied2degrees.dot
+++ /dev/null
@@ -1,144 +0,0 @@
-digraph "twoDegreesRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"elipses":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD><TD PORT="display_order.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/province_code.implied2degrees.png b/schema/nrfc/diagrams/tables/province_code.implied2degrees.png
deleted file mode 100644
index 590a0fe490..0000000000
Binary files a/schema/nrfc/diagrams/tables/province_code.implied2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission.1degree.dot b/schema/nrfc/diagrams/tables/submission.1degree.dot
deleted file mode 100644
index 245cd217a4..0000000000
--- a/schema/nrfc/diagrams/tables/submission.1degree.dot
+++ /dev/null
@@ -1,111 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" 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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_status_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD><TD PORT="submission_status_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="submission_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD><TD PORT="submission_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="submission_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_date</TD></TR></TABLE></TD><TD PORT="submission_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission.1degree.png b/schema/nrfc/diagrams/tables/submission.1degree.png
deleted file mode 100644
index 373959d782..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission.2degrees.dot b/schema/nrfc/diagrams/tables/submission.2degrees.dot
deleted file mode 100644
index 7e8f11a624..0000000000
--- a/schema/nrfc/diagrams/tables/submission.2degrees.dot
+++ /dev/null
@@ -1,212 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"elipses":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"elipses":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" 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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_status_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD><TD PORT="submission_status_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="submission_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD><TD PORT="submission_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="submission_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_date</TD></TR></TABLE></TD><TD PORT="submission_date.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="elipses" COLSPAN="3" ALIGN="LEFT">...</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="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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission.2degrees.png b/schema/nrfc/diagrams/tables/submission.2degrees.png
deleted file mode 100644
index b5bdfdc109..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_contact.1degree.dot b/schema/nrfc/diagrams/tables/submission_contact.1degree.dot
deleted file mode 100644
index 539d146e2a..0000000000
--- a/schema/nrfc/diagrams/tables/submission_contact.1degree.dot
+++ /dev/null
@@ -1,64 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="2" 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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD><TD PORT="submission_contact_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="contact_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD><TD PORT="contact_type_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="idp_user_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">idp_user_id</TD></TR></TABLE></TD><TD PORT="idp_user_id.type" ALIGN="LEFT">varchar[50]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_contact.1degree.png b/schema/nrfc/diagrams/tables/submission_contact.1degree.png
deleted file mode 100644
index 14be1f7f88..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_contact.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_contact.2degrees.dot b/schema/nrfc/diagrams/tables/submission_contact.2degrees.dot
deleted file mode 100644
index 6a3ca84a9b..0000000000
--- a/schema/nrfc/diagrams/tables/submission_contact.2degrees.dot
+++ /dev/null
@@ -1,125 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"contact_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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="113" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="2" 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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD><TD PORT="submission_contact_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="contact_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD><TD PORT="contact_type_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="idp_user_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">idp_user_id</TD></TR></TABLE></TD><TD PORT="idp_user_id.type" ALIGN="LEFT">varchar[50]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_contact.2degrees.png b/schema/nrfc/diagrams/tables/submission_contact.2degrees.png
deleted file mode 100644
index c281a31fe0..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_contact.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_detail.1degree.dot b/schema/nrfc/diagrams/tables/submission_detail.1degree.dot
deleted file mode 100644
index f2cc1c39c8..0000000000
--- a/schema/nrfc/diagrams/tables/submission_detail.1degree.dot
+++ /dev/null
@@ -1,117 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_id" COLSPAN="2" 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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD><TD PORT="submission_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD><TD PORT="client_number.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD><TD PORT="incorporation_number.type" ALIGN="LEFT">varchar[13]</TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD><TD PORT="organization_name.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD><TD PORT="good_standing_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD><TD PORT="birthdate.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD><TD PORT="work_safe_bc_number.type" ALIGN="LEFT">varchar[6]</TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD><TD PORT="doing_business_as.type" ALIGN="LEFT">varchar[120]</TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD><TD PORT="client_acronym.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD><TD PORT="middle_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD><TD PORT="client_identification.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="identification_country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD><TD PORT="identification_country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="identification_province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD><TD PORT="identification_province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_detail.1degree.png b/schema/nrfc/diagrams/tables/submission_detail.1degree.png
deleted file mode 100644
index 08501f4653..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_detail.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_detail.2degrees.dot b/schema/nrfc/diagrams/tables/submission_detail.2degrees.dot
deleted file mode 100644
index 03a8857f96..0000000000
--- a/schema/nrfc/diagrams/tables/submission_detail.2degrees.dot
+++ /dev/null
@@ -1,192 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_id" COLSPAN="2" 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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD><TD PORT="submission_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD><TD PORT="client_number.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD><TD PORT="incorporation_number.type" ALIGN="LEFT">varchar[13]</TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD><TD PORT="organization_name.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD><TD PORT="good_standing_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD><TD PORT="birthdate.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD><TD PORT="work_safe_bc_number.type" ALIGN="LEFT">varchar[6]</TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD><TD PORT="doing_business_as.type" ALIGN="LEFT">varchar[120]</TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD><TD PORT="client_acronym.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD><TD PORT="middle_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD><TD PORT="client_identification.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="identification_country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD><TD PORT="identification_country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="identification_province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD><TD PORT="identification_province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_detail.2degrees.png b/schema/nrfc/diagrams/tables/submission_detail.2degrees.png
deleted file mode 100644
index 1a58cdd57b..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_detail.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.dot b/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.dot
deleted file mode 100644
index bf0f679539..0000000000
--- a/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.dot
+++ /dev/null
@@ -1,117 +0,0 @@
-digraph "oneDegreeRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_id" COLSPAN="2" 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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD><TD PORT="submission_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD><TD PORT="client_number.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD><TD PORT="incorporation_number.type" ALIGN="LEFT">varchar[13]</TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD><TD PORT="organization_name.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD><TD PORT="good_standing_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD><TD PORT="birthdate.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD><TD PORT="work_safe_bc_number.type" ALIGN="LEFT">varchar[6]</TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD><TD PORT="doing_business_as.type" ALIGN="LEFT">varchar[120]</TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD><TD PORT="client_acronym.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD><TD PORT="middle_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD><TD PORT="client_identification.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="identification_country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD><TD PORT="identification_country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="identification_province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD><TD PORT="identification_province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.png b/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.png
deleted file mode 100644
index 08501f4653..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_detail.implied1degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.dot b/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.dot
deleted file mode 100644
index 947fde34f5..0000000000
--- a/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.dot
+++ /dev/null
@@ -1,193 +0,0 @@
-digraph "twoDegreesRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"country_code":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"business_type_code":w -> "business_type_code":"business_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"client_type_code":w -> "client_type_code":"client_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"district_code":w -> "district_code":"district_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"identification_type_code":w -> "identification_type_code":"identification_type_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "business_type_code" [
-   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="116" HEIGHT="16"><B>business_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="business_type_code" 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="116" HEIGHT="16">business_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="business_type_code.html"
-    target="_top"
-    tooltip="business_type_code"
-  ];
-  "client_type_code" [
-   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="98" HEIGHT="16"><B>client_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="client_type_code" 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="113" HEIGHT="16">client_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="client_type_code.html"
-    target="_top"
-    tooltip="client_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "district_code" [
-   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="76" HEIGHT="16"><B>district_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="district_code" 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="113" HEIGHT="16">district_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="district_code.html"
-    target="_top"
-    tooltip="district_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="identification_type_code" 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="145" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="145" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_detail_id" COLSPAN="2" 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="171" HEIGHT="16">submission_detail_id</TD></TR></TABLE></TD><TD PORT="submission_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="client_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_number</TD></TR></TABLE></TD><TD PORT="client_number.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="business_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">business_type_code</TD></TR></TABLE></TD><TD PORT="business_type_code.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="incorporation_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">incorporation_number</TD></TR></TABLE></TD><TD PORT="incorporation_number.type" ALIGN="LEFT">varchar[13]</TD></TR>
-      <TR><TD PORT="organization_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">organization_name</TD></TR></TABLE></TD><TD PORT="organization_name.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="client_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_type_code</TD></TR></TABLE></TD><TD PORT="client_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="good_standing_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">good_standing_ind</TD></TR></TABLE></TD><TD PORT="good_standing_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="birthdate" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">birthdate</TD></TR></TABLE></TD><TD PORT="birthdate.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="district_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">district_code</TD></TR></TABLE></TD><TD PORT="district_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="work_safe_bc_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">work_safe_bc_number</TD></TR></TABLE></TD><TD PORT="work_safe_bc_number.type" ALIGN="LEFT">varchar[6]</TD></TR>
-      <TR><TD PORT="doing_business_as" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">doing_business_as</TD></TR></TABLE></TD><TD PORT="doing_business_as.type" ALIGN="LEFT">varchar[120]</TD></TR>
-      <TR><TD PORT="client_acronym" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_acronym</TD></TR></TABLE></TD><TD PORT="client_acronym.type" ALIGN="LEFT">varchar[8]</TD></TR>
-      <TR><TD PORT="first_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">first_name</TD></TR></TABLE></TD><TD PORT="first_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="middle_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">middle_name</TD></TR></TABLE></TD><TD PORT="middle_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="last_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">last_name</TD></TR></TABLE></TD><TD PORT="last_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="identification_type_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_type_code</TD></TR></TABLE></TD><TD PORT="identification_type_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD PORT="client_identification" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">client_identification</TD></TR></TABLE></TD><TD PORT="client_identification.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="identification_country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_country_code</TD></TR></TABLE></TD><TD PORT="identification_country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="identification_province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="171" HEIGHT="16">identification_province_code</TD></TR></TABLE></TD><TD PORT="identification_province_code.type" ALIGN="LEFT">varchar[4]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.png b/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.png
deleted file mode 100644
index eebc257349..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_detail.implied2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location.1degree.dot b/schema/nrfc/diagrams/tables/submission_location.1degree.dot
deleted file mode 100644
index c8fcf9a0a3..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location.1degree.dot
+++ /dev/null
@@ -1,86 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="2" 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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD><TD PORT="submission_location_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD><TD PORT="street_address.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD><TD PORT="city_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD><TD PORT="postal_code.type" ALIGN="LEFT">varchar[10]</TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD><TD PORT="location_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD><TD PORT="complementary_address_1.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD><TD PORT="complementary_address_2.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location.1degree.png b/schema/nrfc/diagrams/tables/submission_location.1degree.png
deleted file mode 100644
index efd6c023f3..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location.2degrees.dot b/schema/nrfc/diagrams/tables/submission_location.2degrees.dot
deleted file mode 100644
index 5b69db4035..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location.2degrees.dot
+++ /dev/null
@@ -1,145 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="2" 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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD><TD PORT="submission_location_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD><TD PORT="street_address.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD><TD PORT="city_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD><TD PORT="postal_code.type" ALIGN="LEFT">varchar[10]</TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD><TD PORT="location_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD><TD PORT="complementary_address_1.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD><TD PORT="complementary_address_2.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location.2degrees.png b/schema/nrfc/diagrams/tables/submission_location.2degrees.png
deleted file mode 100644
index 4813559f42..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location.implied1degrees.dot b/schema/nrfc/diagrams/tables/submission_location.implied1degrees.dot
deleted file mode 100644
index c1c424d084..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location.implied1degrees.dot
+++ /dev/null
@@ -1,86 +0,0 @@
-digraph "oneDegreeRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="display_order" COLSPAN="3" BGCOLOR="#ffffff" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="113" HEIGHT="16">display_order</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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="113" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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="113" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_location" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="2" 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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD><TD PORT="submission_location_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD><TD PORT="street_address.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD><TD PORT="city_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD><TD PORT="postal_code.type" ALIGN="LEFT">varchar[10]</TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD><TD PORT="location_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD><TD PORT="complementary_address_1.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD><TD PORT="complementary_address_2.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location.implied1degrees.png b/schema/nrfc/diagrams/tables/submission_location.implied1degrees.png
deleted file mode 100644
index efd6c023f3..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location.implied1degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location.implied2degrees.dot b/schema/nrfc/diagrams/tables/submission_location.implied2degrees.dot
deleted file mode 100644
index 4a802b5254..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location.implied2degrees.dot
+++ /dev/null
@@ -1,158 +0,0 @@
-digraph "twoDegreesRelationshipsDiagramImplied" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "identification_type_code":"elipses":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "province_code":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "identification_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"country_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"province_code":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "identification_type_code" [
-   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="145" HEIGHT="16"><B>identification_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="identification_type_code.html"
-    target="_top"
-    tooltip="identification_type_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_location_id" COLSPAN="2" 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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD><TD PORT="submission_location_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="street_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">street_address</TD></TR></TABLE></TD><TD PORT="street_address.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="country_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD><TD PORT="country_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="province_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD><TD PORT="province_code.type" ALIGN="LEFT">varchar[2]</TD></TR>
-      <TR><TD PORT="city_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">city_name</TD></TR></TABLE></TD><TD PORT="city_name.type" ALIGN="LEFT">varchar[30]</TD></TR>
-      <TR><TD PORT="postal_code" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">postal_code</TD></TR></TABLE></TD><TD PORT="postal_code.type" ALIGN="LEFT">varchar[10]</TD></TR>
-      <TR><TD PORT="location_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">location_name</TD></TR></TABLE></TD><TD PORT="location_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="business_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">business_phone_number</TD></TR></TABLE></TD><TD PORT="business_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="secondary_phone_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">secondary_phone_number</TD></TR></TABLE></TD><TD PORT="secondary_phone_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="fax_number" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">fax_number</TD></TR></TABLE></TD><TD PORT="fax_number.type" ALIGN="LEFT">varchar[14]</TD></TR>
-      <TR><TD PORT="notes" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">notes</TD></TR></TABLE></TD><TD PORT="notes.type" ALIGN="LEFT">varchar[4000]</TD></TR>
-      <TR><TD PORT="complementary_address_1" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_1</TD></TR></TABLE></TD><TD PORT="complementary_address_1.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="complementary_address_2" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">complementary_address_2</TD></TR></TABLE></TD><TD PORT="complementary_address_2.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "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="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">
-      <TR><TD COLSPAN="3"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location.implied2degrees.png b/schema/nrfc/diagrams/tables/submission_location.implied2degrees.png
deleted file mode 100644
index 914d921bbe..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location.implied2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.dot b/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.dot
deleted file mode 100644
index d01b68f8e8..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.dot
+++ /dev/null
@@ -1,46 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  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="2" 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><TD PORT="submission_location_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="2" 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><TD PORT="submission_contact_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.png b/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.png
deleted file mode 100644
index 7613026c8b..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location_contact_xref.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.dot b/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.dot
deleted file mode 100644
index 3b1b2262cb..0000000000
--- a/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.dot
+++ /dev/null
@@ -1,97 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "province_code":"elipses":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"contact_type_code":w -> "contact_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "country_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"country_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"province_code":w -> "province_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"submission_id":w -> "submission":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_contact_id":w -> "submission_contact":"submission_contact_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location_contact_xref":"submission_location_id":w -> "submission_location":"submission_location_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "contact_type_code" [
-   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="110" HEIGHT="16"><B>contact_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="contact_type_code.html"
-    target="_top"
-    tooltip="contact_type_code"
-  ];
-  "country_code" [
-   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="80" HEIGHT="16"><B>country_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">2 &gt;</TD></TR>
-    </TABLE>>
-    URL="country_code.html"
-    target="_top"
-    tooltip="country_code"
-  ];
-  "province_code" [
-   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="85" HEIGHT="16"><B>province_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="province_code.html"
-    target="_top"
-    tooltip="province_code"
-  ];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</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="157" HEIGHT="16">submission_contact_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="contact_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="157" HEIGHT="16">contact_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</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="158" HEIGHT="16">submission_location_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="country_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">country_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="province_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="158" HEIGHT="16">province_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_location_contact_xref" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  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="2" 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><TD PORT="submission_location_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="submission_contact_id" COLSPAN="2" 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><TD PORT="submission_contact_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location_contact_xref.html"
-    target="_top"
-    tooltip="submission_location_contact_xref"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.png b/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.png
deleted file mode 100644
index 754a499762..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_location_contact_xref.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.dot b/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.dot
deleted file mode 100644
index 6514a727bc..0000000000
--- a/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.dot
+++ /dev/null
@@ -1,37 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_matching_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_id" COLSPAN="2" 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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD><TD PORT="submission_matching_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="matching_fields" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">matching_fields</TD></TR></TABLE></TD><TD PORT="matching_fields.type" ALIGN="LEFT">jsonb[2147483647]</TD></TR>
-      <TR><TD PORT="confirmed_match_status_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_status_ind</TD></TR></TABLE></TD><TD PORT="confirmed_match_status_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="confirmed_match_message" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_message</TD></TR></TABLE></TD><TD PORT="confirmed_match_message.type" ALIGN="LEFT">varchar[1000]</TD></TR>
-      <TR><TD PORT="confirmed_match_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_timestamp</TD></TR></TABLE></TD><TD PORT="confirmed_match_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="confirmed_match_userid" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_userid</TD></TR></TABLE></TD><TD PORT="confirmed_match_userid.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="submission_matching_processed" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed</TD></TR></TABLE></TD><TD PORT="submission_matching_processed.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD PORT="submission_matching_processed_time" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed_time</TD></TR></TABLE></TD><TD PORT="submission_matching_processed_time.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.png b/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.png
deleted file mode 100644
index 7be3333318..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_matching_detail.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.dot b/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.dot
deleted file mode 100644
index 9781cfc707..0000000000
--- a/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.dot
+++ /dev/null
@@ -1,97 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"submission_id":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_matching_detail_id" COLSPAN="2" 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="227" HEIGHT="16">submission_matching_detail_id</TD></TR></TABLE></TD><TD PORT="submission_matching_detail_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="submission_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"><IMG SRC="../../images/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_id</TD></TR></TABLE></TD><TD PORT="submission_id.type" ALIGN="LEFT">int4[10]</TD></TR>
-      <TR><TD PORT="matching_fields" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">matching_fields</TD></TR></TABLE></TD><TD PORT="matching_fields.type" ALIGN="LEFT">jsonb[2147483647]</TD></TR>
-      <TR><TD PORT="confirmed_match_status_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_status_ind</TD></TR></TABLE></TD><TD PORT="confirmed_match_status_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="confirmed_match_message" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_message</TD></TR></TABLE></TD><TD PORT="confirmed_match_message.type" ALIGN="LEFT">varchar[1000]</TD></TR>
-      <TR><TD PORT="confirmed_match_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_timestamp</TD></TR></TABLE></TD><TD PORT="confirmed_match_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="confirmed_match_userid" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">confirmed_match_userid</TD></TR></TABLE></TD><TD PORT="confirmed_match_userid.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="submission_matching_processed" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed</TD></TR></TABLE></TD><TD PORT="submission_matching_processed.type" ALIGN="LEFT">bool[1]</TD></TR>
-      <TR><TD PORT="submission_matching_processed_time" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="227" HEIGHT="16">submission_matching_processed_time</TD></TR></TABLE></TD><TD PORT="submission_matching_processed_time.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.png b/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.png
deleted file mode 100644
index 84e43fc4ef..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_matching_detail.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_status_code.1degree.dot b/schema/nrfc/diagrams/tables/submission_status_code.1degree.dot
deleted file mode 100644
index 59124f2268..0000000000
--- a/schema/nrfc/diagrams/tables/submission_status_code.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_status_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" COLSPAN="2" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD><TD PORT="submission_status_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_status_code.1degree.png b/schema/nrfc/diagrams/tables/submission_status_code.1degree.png
deleted file mode 100644
index 3a90c222cd..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_status_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_status_code.2degrees.dot b/schema/nrfc/diagrams/tables/submission_status_code.2degrees.dot
deleted file mode 100644
index 6f683fcfcb..0000000000
--- a/schema/nrfc/diagrams/tables/submission_status_code.2degrees.dot
+++ /dev/null
@@ -1,96 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"submission_status_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" COLSPAN="2" 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="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD><TD PORT="submission_status_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   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="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_status_code.2degrees.png b/schema/nrfc/diagrams/tables/submission_status_code.2degrees.png
deleted file mode 100644
index 88f472fb2f..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_status_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_type_code.1degree.dot b/schema/nrfc/diagrams/tables/submission_type_code.1degree.dot
deleted file mode 100644
index a48a877602..0000000000
--- a/schema/nrfc/diagrams/tables/submission_type_code.1degree.dot
+++ /dev/null
@@ -1,36 +0,0 @@
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" COLSPAN="2" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD><TD PORT="submission_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_type_code.1degree.png b/schema/nrfc/diagrams/tables/submission_type_code.1degree.png
deleted file mode 100644
index 90777c1ef3..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_type_code.1degree.png and /dev/null differ
diff --git a/schema/nrfc/diagrams/tables/submission_type_code.2degrees.dot b/schema/nrfc/diagrams/tables/submission_type_code.2degrees.dot
deleted file mode 100644
index 28356d2d41..0000000000
--- a/schema/nrfc/diagrams/tables/submission_type_code.2degrees.dot
+++ /dev/null
@@ -1,96 +0,0 @@
-digraph "twoDegreesRelationshipsDiagram" {
-  graph [    rankdir="RL"    bgcolor="#ffffff"    label="\nGenerated by SchemaSpy"    labeljust="l"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "submission":"submission_status_code":w -> "submission_status_code":"elipses":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission":"submission_type_code":w -> "submission_type_code":"submission_type_code.type":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_contact":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_location":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission_matching_detail":"elipses":w -> "submission":"submission_id":e [arrowhead=none dir=back arrowtail=crowodot];
-  "submission" [
-   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="67" HEIGHT="16"><B>submission</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_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="143" HEIGHT="16">submission_id</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_status_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_status_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" 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/foreignKeys.png"/></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="143" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">4 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission.html"
-    target="_top"
-    tooltip="submission"
-  ];
-  "submission_contact" [
-   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="118" HEIGHT="16"><B>submission_contact</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_contact.html"
-    target="_top"
-    tooltip="submission_contact"
-  ];
-  "submission_detail" [
-   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="107" HEIGHT="16"><B>submission_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 7</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_detail.html"
-    target="_top"
-    tooltip="submission_detail"
-  ];
-  "submission_location" [
-   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="121" HEIGHT="16"><B>submission_location</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 4</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_location.html"
-    target="_top"
-    tooltip="submission_location"
-  ];
-  "submission_matching_detail" [
-   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="168" HEIGHT="16"><B>submission_matching_detail</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD></TR>
-    </TABLE>>
-    URL="submission_matching_detail.html"
-    target="_top"
-    tooltip="submission_matching_detail"
-  ];
-  "submission_status_code" [
-   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="143" HEIGHT="16"><B>submission_status_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_status_code.html"
-    target="_top"
-    tooltip="submission_status_code"
-  ];
-  "submission_type_code" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16"><B>submission_type_code</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="submission_type_code" COLSPAN="2" 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="132" HEIGHT="16">submission_type_code</TD></TR></TABLE></TD><TD PORT="submission_type_code.type" ALIGN="LEFT">varchar[5]</TD></TR>
-      <TR><TD PORT="description" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">description</TD></TR></TABLE></TD><TD PORT="description.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="effective_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">effective_date</TD></TR></TABLE></TD><TD PORT="effective_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="expiry_date" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">expiry_date</TD></TR></TABLE></TD><TD PORT="expiry_date.type" ALIGN="LEFT">date[13]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="create_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">create_user</TD></TR></TABLE></TD><TD PORT="create_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD PORT="update_user" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="132" HEIGHT="16">update_user</TD></TR></TABLE></TD><TD PORT="update_user.type" ALIGN="LEFT">varchar[60]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="submission_type_code.html"
-    target="_top"
-    tooltip="submission_type_code"
-  ];
-}
diff --git a/schema/nrfc/diagrams/tables/submission_type_code.2degrees.png b/schema/nrfc/diagrams/tables/submission_type_code.2degrees.png
deleted file mode 100644
index affadf042d..0000000000
Binary files a/schema/nrfc/diagrams/tables/submission_type_code.2degrees.png and /dev/null differ
diff --git a/schema/nrfc/insertionOrder.txt b/schema/nrfc/insertionOrder.txt
deleted file mode 100644
index abe0f6c994..0000000000
--- a/schema/nrfc/insertionOrder.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-country_code
-business_type_code
-client_type_code
-contact_type_code
-district_code
-submission_status_code
-submission_type_code
-province_code
-submission
-identification_type_code
-submission_contact
-submission_location
-submission_matching_detail
-submission_location_contact_xref
-submission_detail
-email_log
-flyway_schema_history
diff --git a/schema/nrfc/relationships.html b/schema/nrfc/relationships.html
deleted file mode 100644
index 7daf07adfd..0000000000
--- a/schema/nrfc/relationships.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="bower/html5shiv/html5shiv.min.js"></script>
-        <script src="bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>All Relationships</h1>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 class="box-title">Diagrams</h3>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom">
-                                <!-- Tabs within a box -->
-                                <h5>By default only columns that are primary keys, foreign keys or indexes are shown.</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#compactDegreeImg-chart" data-toggle="tab" aria-expanded="true">Compact</a></li>
-                                    <li class=""><a href="#largeDegreeImg-chart" data-toggle="tab" aria-expanded="true">Large</a></li>
-                                    <li class=""><a href="#compactimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Compact Implied</a></li>
-                                    <li class=""><a href="#largeimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Large Implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="compactDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="compactRelationshipsDiagram" name="compactRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/submission_contact.html" target="_top" title="submission_contact" alt="" coords="684,5,943,181">
-<area shape="rect" id="node6" href="tables/submission.html" target="_top" title="submission" alt="" coords="337,228,577,404">
-<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_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="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">
-<area shape="rect" id="node10" href="tables/district_code.html" target="_top" title="district_code" alt="" coords="357,891,557,1008">
-<area shape="rect" id="node11" href="tables/business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,457,574,575">
-<area shape="rect" id="node12" href="tables/submission_detail.html" target="_top" title="submission_detail" alt="" coords="675,585,952,908">
-<area shape="rect" id="node13" href="tables/identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,1025,593,1172">
-</map>
-                                        <a name='diagram'><img id="compactDegreeImg" src="diagrams/summary/relationships.real.compact.png" usemap="#compactRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="largeDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="largeRelationshipsDiagram" name="largeRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/submission_contact.html" target="_top" title="submission_contact" alt="" coords="684,5,943,363">
-<area shape="rect" id="node6" href="tables/submission.html" target="_top" title="submission" alt="" coords="337,409,577,679">
-<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_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="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">
-<area shape="rect" id="node10" href="tables/district_code.html" target="_top" title="district_code" alt="" coords="357,1739,557,2067">
-<area shape="rect" id="node11" href="tables/business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,732,574,1031">
-<area shape="rect" id="node12" href="tables/submission_detail.html" target="_top" title="submission_detail" alt="" coords="675,1247,952,1927">
-<area shape="rect" id="node13" href="tables/identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,2084,593,2412">
-</map>
-                                        <a name='diagram'><img id="largeDegreeImg" src="diagrams/summary/relationships.real.large.png" usemap="#largeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="compactimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="compactImpliedRelationshipsDiagram" name="compactImpliedRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/submission_contact.html" target="_top" title="submission_contact" alt="" coords="684,5,943,181">
-<area shape="rect" id="node6" href="tables/submission.html" target="_top" title="submission" alt="" coords="337,228,577,404">
-<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_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="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">
-<area shape="rect" id="node10" href="tables/district_code.html" target="_top" title="district_code" alt="" coords="357,891,557,1008">
-<area shape="rect" id="node11" href="tables/business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,621,574,739">
-<area shape="rect" id="node12" href="tables/submission_detail.html" target="_top" title="submission_detail" alt="" coords="675,585,952,908">
-<area shape="rect" id="node13" href="tables/identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,1025,593,1172">
-</map>
-                                        <a name='diagram'><img id="compactimpliedDegreeImg" src="diagrams/summary/relationships.implied.compact.png" usemap="#compactImpliedRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="largeimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="largeImpliedRelationshipsDiagram" name="largeImpliedRelationshipsDiagram">
-<area shape="rect" id="node1" href="tables/submission_contact.html" target="_top" title="submission_contact" alt="" coords="684,5,943,363">
-<area shape="rect" id="node6" href="tables/submission.html" target="_top" title="submission" alt="" coords="337,453,577,723">
-<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_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="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">
-<area shape="rect" id="node10" href="tables/district_code.html" target="_top" title="district_code" alt="" coords="357,1849,557,2177">
-<area shape="rect" id="node11" href="tables/business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,1217,574,1516">
-<area shape="rect" id="node12" href="tables/submission_detail.html" target="_top" title="submission_detail" alt="" coords="675,1247,952,1927">
-<area shape="rect" id="node13" href="tables/identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,2195,593,2523">
-</map>
-                                        <a name='diagram'><img id="largeimpliedDegreeImg" src="diagrams/summary/relationships.implied.large.png" usemap="#largeImpliedRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="bower/pdfmake/pdfmake.min.js"></script>
-        <script src="bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="bower/codemirror/codemirror.js"></script>
-        <script src="bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="relationships.js"></script>
-        <script src="schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/business_type_code.html b/schema/nrfc/tables/business_type_code.html
deleted file mode 100644
index 6886942ca9..0000000000
--- a/schema/nrfc/tables/business_type_code.html
+++ /dev/null
@@ -1,400 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>business_type_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>business_type_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="business_type_code">business_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>1</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.business_type_code references business_type_code.business_type_code via submission_detail_business_type_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.business_type_code</span></td>
-                                                <td class="constraint detail">submission_detail_business_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code indicating the business type of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> business_type_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>business_type_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="380,5,657,328">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="5,61,336,365">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/business_type_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="380,417,657,740">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="5,111,336,415">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="65,432,276,520">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="80,537,261,625">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="74,748,267,836">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="34,643,307,731">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="86,5,255,93">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/business_type_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/client_type_code.html b/schema/nrfc/tables/client_type_code.html
deleted file mode 100644
index 879222494c..0000000000
--- a/schema/nrfc/tables/client_type_code.html
+++ /dev/null
@@ -1,400 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>client_type_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>client_type_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A code indicating the type of a client. Examples include, but are not limited to: Corporation, Individual, Association, and others.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="client_type_code">client_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.client_type_code references client_type_code.client_type_code via submission_detail_client_type_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.client_type_code</span></td>
-                                                <td class="constraint detail">submission_detail_client_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the type of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> client_type_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>client_type_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="376,5,653,328">
-<area shape="rect" id="node2" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="5,91,332,395">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/client_type_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="376,417,653,740">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="51,111,286,199">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="5,216,332,520">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="78,537,259,625">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="72,748,265,836">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="32,643,305,731">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="84,5,253,93">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/client_type_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/contact_type_code.html b/schema/nrfc/tables/contact_type_code.html
deleted file mode 100644
index 528289a38a..0000000000
--- a/schema/nrfc/tables/contact_type_code.html
+++ /dev/null
@@ -1,397 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>contact_type_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>contact_type_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A code indicating the role of a contact of a client.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="contact_type_code">contact_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_contact.contact_type_code references contact_type_code.contact_type_code via submission_contact_contact_type_code_fk"><a href='submission_contact.html'>submission_contact</a><span class='relatedKey'>.contact_type_code</span></td>
-                                                <td class="constraint detail">submission_contact_contact_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a role of a client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> contact_type_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>contact_type_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="376,5,635,181">
-<area shape="rect" id="node2" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="5,61,332,365">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/contact_type_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="376,15,635,191">
-<area shape="rect" id="node2" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="5,111,332,415">
-<area shape="rect" id="node3" href="submission.html" target="_top" title="submission" alt="" coords="84,5,253,93">
-<area shape="rect" id="node4" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="679,17,1025,105">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/contact_type_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/country_code.html b/schema/nrfc/tables/country_code.html
deleted file mode 100644
index 94e9fda7ff..0000000000
--- a/schema/nrfc/tables/country_code.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>country_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>country_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A list of countries, serving as a reference for country-specific data.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="country_code">country_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="identification_type_code.country_code&#39;s name implies that it&#39;s a child of country_code.country_code, but it doesn&#39;t reference that column."><a href='identification_type_code.html'>identification_type_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">Implied Constraint</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="province_code.country_code references country_code.country_code via province_code_country_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">province_code_country_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_location.country_code references country_code.country_code via submission_location_country_code_fk"><a href='submission_location.html'>submission_location</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_country_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a country.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='indexedColumn' title='Indexed'><i class='fa fa-sitemap fa-rotate-120' style='padding-right: 5px;'></i><span id="display_order">display_order</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The the display order of a country. If no value is provided, the application will order countries alphabetically by default.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> country_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>country_code</td>
-                                </tr>
-                                <tr>
-                                    <td class='uniqueKey' title='Unique Key'><i class='icon ion-key iconkey'></i> display_order_uk</td>
-                                    <td>Must be unique</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>display_order</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                    <li class=""><a href="#oneimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">One implied</a></li>
-                                    <li class=""><a href="#twoimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="376,93,576,240">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,67,332,400">
-<area shape="rect" id="node3" href="submission_location.html" target="_top" title="submission_location" alt="" coords="620,5,880,211">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/country_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="376,140,569,228">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,44,332,378">
-<area shape="rect" id="node3" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="623,138,845,226">
-<area shape="rect" id="node4" href="submission.html" target="_top" title="submission" alt="" coords="388,35,557,123">
-<area shape="rect" id="node5" href="submission_location.html" target="_top" title="submission_location" alt="" coords="613,32,855,120">
-<area shape="rect" id="node6" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="899,30,1245,118">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/country_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="oneimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagramImplied" name="oneDegreeRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="376,5,649,152">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,127,332,460">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="413,205,613,352">
-<area shape="rect" id="node4" href="submission_location.html" target="_top" title="submission_location" alt="" coords="693,117,953,323">
-</map>
-                                        <a name='diagram'><img id="oneimpliedDegreeImg" src="../diagrams/tables/country_code.implied1degrees.png" usemap="#oneDegreeRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twoimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagramImplied" name="twoDegreesRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="376,265,649,412">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,152,332,485">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="416,160,609,248">
-<area shape="rect" id="node4" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="703,160,925,248">
-<area shape="rect" id="node5" href="submission.html" target="_top" title="submission" alt="" coords="428,54,597,142">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="693,54,935,142">
-<area shape="rect" id="node7" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="979,52,1325,140">
-</map>
-                                        <a name='diagram'><img id="twoimpliedDegreeImg" src="../diagrams/tables/country_code.implied2degrees.png" usemap="#twoDegreesRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/district_code.html b/schema/nrfc/tables/district_code.html
deleted file mode 100644
index 771fdb20d5..0000000000
--- a/schema/nrfc/tables/district_code.html
+++ /dev/null
@@ -1,417 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>district_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>district_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A list of Natural Resource Districts.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="district_code">district_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.district_code references district_code.district_code via submission_detail_district_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.district_code</span></td>
-                                                <td class="constraint detail">submission_detail_district_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a Natural Resource District.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_address">email_address</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The email address of the Natural Resource District.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> district_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>district_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="376,5,653,328">
-<area shape="rect" id="node2" href="district_code.html" target="_top" title="district_code" alt="" coords="5,120,332,453">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/district_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="376,207,653,529">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="51,111,286,199">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="63,216,274,304">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="5,321,332,655">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="72,777,265,865">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="32,672,305,760">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="84,5,253,93">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/district_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/email_log.html b/schema/nrfc/tables/email_log.html
deleted file mode 100644
index 5702698e32..0000000000
--- a/schema/nrfc/tables/email_log.html
+++ /dev/null
@@ -1,415 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>email_log - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>email_log</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>Stores email log information</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="email_log_id">email_log_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.email_log_id_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission email log.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_id">email_id</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Identifier for the associated email assigned by CHES (if applicable).</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_sent_ind">email_sent_ind</span></td>
-                                    <td>varchar</td>
-                                    <td>1</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Indicator for whether the email has been sent (&lsquo;Y&rsquo; for Yes, &lsquo;N&rsquo; for No).</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="exception_message">exception_message</span></td>
-                                    <td>text</td>
-                                    <td>2147483647</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Textual message describing any exceptions that occurred during email processing.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="template_name">template_name</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Name of the email template used for sending the email.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_address">email_address</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Email address to which the email is sent.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_subject">email_subject</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Subject of the email.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_variables">email_variables</span></td>
-                                    <td>jsonb</td>
-                                    <td>2147483647</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>JSONB field to store variables related to the email content.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Timestamp indicating when the email log entry was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Timestamp indicating when the email log entry was last updated.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> email_log_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>email_log_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="email_log.html" target="_top" title="email_log" alt="" coords="5,5,351,368">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/email_log.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/identification_type_code.html b/schema/nrfc/tables/identification_type_code.html
deleted file mode 100644
index 858c601224..0000000000
--- a/schema/nrfc/tables/identification_type_code.html
+++ /dev/null
@@ -1,433 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>identification_type_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>identification_type_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="identification_type_code">identification_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>4</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.identification_type_code references identification_type_code.identification_type_code via identification_type_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.identification_type_code</span></td>
-                                                <td class="constraint detail">identification_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code indicating the identification type of a client. Examples of possible ID types include Canadian Birth Certificate, Canadian Passport, and others.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="country_code">country_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="identification_type_code.country_code&#39;s name implies that it&#39;s a child of country_code.country_code, but it doesn&#39;t reference that column."><a href='country_code.html'>country_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">Implied Constraint</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> identification_type_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>identification_type_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                    <li class=""><a href="#oneimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">One implied</a></li>
-                                    <li class=""><a href="#twoimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="419,5,696,328">
-<area shape="rect" id="node2" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="5,149,375,483">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/identification_type_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="419,201,696,524">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="73,111,307,199">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="85,216,295,304">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="99,321,281,409">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="93,777,287,865">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="5,427,375,760">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="105,5,275,93">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/identification_type_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="oneimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagramImplied" name="oneDegreeRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="249,149,619,483">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,211,205,357">
-<area shape="rect" id="node3" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="663,5,940,328">
-</map>
-                                        <a name='diagram'><img id="oneimpliedDegreeImg" src="../diagrams/tables/identification_type_code.implied1degrees.png" usemap="#oneDegreeRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twoimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagramImplied" name="twoDegreesRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="249,427,619,760">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,775,205,921">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="337,777,531,865">
-<area shape="rect" id="node4" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="663,201,940,524">
-<area shape="rect" id="node5" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="317,5,551,93">
-<area shape="rect" id="node6" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="329,111,539,199">
-<area shape="rect" id="node7" href="district_code.html" target="_top" title="district_code" alt="" coords="343,321,525,409">
-<area shape="rect" id="node8" href="submission.html" target="_top" title="submission" alt="" coords="349,216,519,304">
-<area shape="rect" id="node9" href="submission_location.html" target="_top" title="submission_location" alt="" coords="681,777,922,865">
-</map>
-                                        <a name='diagram'><img id="twoimpliedDegreeImg" src="../diagrams/tables/identification_type_code.implied2degrees.png" usemap="#twoDegreesRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/province_code.html b/schema/nrfc/tables/province_code.html
deleted file mode 100644
index 245b632bf6..0000000000
--- a/schema/nrfc/tables/province_code.html
+++ /dev/null
@@ -1,485 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>province_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>province_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A list of provinces, states, departments or territories, serving as a reference for province-specific data.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="province_code">province_code</span></td>
-                                    <td>varchar</td>
-                                    <td>4</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.[identification_country_code, identification_province_code] references province_code.[country_code, province_code] via province_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.identification_province_code</span></td>
-                                                <td class="constraint detail">province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='submission_location.html'>submission_location</a><span class='relatedKey'>.province_code</span></td>
-                                                <td class="constraint detail">submission_location_province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a province, state, department or territory.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="country_code">country_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.[identification_country_code, identification_province_code] references province_code.[country_code, province_code] via province_code_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.identification_country_code</span></td>
-                                                <td class="constraint detail">province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='submission_location.html'>submission_location</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="province_code.country_code references country_code.country_code via province_code_country_code_fk"><a href='country_code.html'>country_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">province_code_country_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the country in which the province is located.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="display_order">display_order</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The the display order of a province/state. If no value is provided, the application will order provinces/states alphabetically by default.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> province_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-                                    <td>country_code + province_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                    <li class=""><a href="#oneimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">One implied</a></li>
-                                    <li class=""><a href="#twoimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="249,208,576,571">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,395,205,541">
-<area shape="rect" id="node3" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="620,5,897,328">
-<area shape="rect" id="node4" href="submission_location.html" target="_top" title="submission_location" alt="" coords="629,345,889,551">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/province_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="236,532,563,895">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,724,192,812">
-<area shape="rect" id="node3" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="607,201,884,524">
-<area shape="rect" id="node4" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="282,5,517,93">
-<area shape="rect" id="node5" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="294,216,505,304">
-<area shape="rect" id="node6" href="district_code.html" target="_top" title="district_code" alt="" coords="309,321,490,409">
-<area shape="rect" id="node7" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="263,427,536,515">
-<area shape="rect" id="node8" href="submission.html" target="_top" title="submission" alt="" coords="315,111,484,199">
-<area shape="rect" id="node9" href="submission_location.html" target="_top" title="submission_location" alt="" coords="625,556,866,644">
-<area shape="rect" id="node10" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="928,553,1275,641">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/province_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="oneimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagramImplied" name="oneDegreeRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="249,208,576,571">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,395,205,541">
-<area shape="rect" id="node3" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="620,5,897,328">
-<area shape="rect" id="node4" href="submission_location.html" target="_top" title="submission_location" alt="" coords="629,345,889,551">
-</map>
-                                        <a name='diagram'><img id="oneimpliedDegreeImg" src="../diagrams/tables/province_code.implied1degrees.png" usemap="#oneDegreeRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twoimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagramImplied" name="twoDegreesRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="263,427,536,515">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,569,192,657">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="236,532,563,895">
-<area shape="rect" id="node4" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="607,201,884,524">
-<area shape="rect" id="node5" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="282,5,517,93">
-<area shape="rect" id="node6" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="294,216,505,304">
-<area shape="rect" id="node7" href="district_code.html" target="_top" title="district_code" alt="" coords="309,321,490,409">
-<area shape="rect" id="node8" href="submission.html" target="_top" title="submission" alt="" coords="315,111,484,199">
-<area shape="rect" id="node9" href="submission_location.html" target="_top" title="submission_location" alt="" coords="625,555,866,643">
-<area shape="rect" id="node10" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="928,552,1275,640">
-</map>
-                                        <a name='diagram'><img id="twoimpliedDegreeImg" src="../diagrams/tables/province_code.implied2degrees.png" usemap="#twoDegreesRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission.html b/schema/nrfc/tables/submission.html
deleted file mode 100644
index 50ae410d15..0000000000
--- a/schema/nrfc/tables/submission.html
+++ /dev/null
@@ -1,421 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A submission request to create a client.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_id">submission_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.submission_id_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_contact.submission_id references submission.submission_id via submission_id_fk"><a href='submission_contact.html'>submission_contact</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_detail.submission_id references submission.submission_id via submission_id_fk"><a href='submission_detail.html'>submission_detail</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_location.submission_id references submission.submission_id via submission_id_fk"><a href='submission_location.html'>submission_location</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_matching_detail.submission_id references submission.submission_id via submission_id_fk"><a href='submission_matching_detail.html'>submission_matching_detail</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_status_code">submission_status_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission.submission_status_code references submission_status_code.submission_status_code via submission_submission_status_code_fk"><a href='submission_status_code.html'>submission_status_code</a><span class='relatedKey'>.submission_status_code</span></td>
-                                                <td class="constraint detail">submission_submission_status_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>TBD.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_type_code">submission_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission.submission_type_code references submission_type_code.submission_type_code via submission_submission_type_code_fk"><a href='submission_type_code.html'>submission_type_code</a><span class='relatedKey'>.submission_type_code</span></td>
-                                                <td class="constraint detail">submission_submission_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code indicating the status of a submission request. Examples include, but are not limited to: New, Approved, Rejected, and others.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="submission_date">submission_date</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="320,396,687,671">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,375,276,492">
-<area shape="rect" id="node3" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,509,269,627">
-<area shape="rect" id="node4" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="777,5,1036,181">
-<area shape="rect" id="node5" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="768,199,1045,521">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="777,539,1037,744">
-<area shape="rect" id="node7" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="731,761,1083,908">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="407,764,600,852">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="47,645,234,733">
-<area shape="rect" id="node3" href="submission.html" target="_top" title="submission" alt="" coords="320,225,687,500">
-<area shape="rect" id="node4" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,205,276,323">
-<area shape="rect" id="node5" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,340,269,457">
-<area shape="rect" id="node6" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="777,5,1036,181">
-<area shape="rect" id="node7" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="390,67,617,155">
-<area shape="rect" id="node8" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="768,585,1045,908">
-<area shape="rect" id="node9" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="386,553,621,641">
-<area shape="rect" id="node10" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="398,659,609,747">
-<area shape="rect" id="node11" href="district_code.html" target="_top" title="district_code" alt="" coords="413,869,594,957">
-<area shape="rect" id="node12" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="367,975,640,1063">
-<area shape="rect" id="node13" href="submission_location.html" target="_top" title="submission_location" alt="" coords="777,363,1037,568">
-<area shape="rect" id="node14" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1127,187,1473,275">
-<area shape="rect" id="node15" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="731,199,1083,345">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_contact.html b/schema/nrfc/tables/submission_contact.html
deleted file mode 100644
index b3eb830fc3..0000000000
--- a/schema/nrfc/tables/submission_contact.html
+++ /dev/null
@@ -1,448 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_contact - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_contact</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>The details of a contacts for each client&rsquo;s location.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_contact_id">submission_contact_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.submission_contact_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location_contact_xref.submission_contact_id references submission_contact.submission_contact_id via submission_contact_id_fk"><a href='submission_location_contact_xref.html'>submission_location_contact_xref</a><span class='relatedKey'>.submission_contact_id</span></td>
-                                                <td class="constraint detail">submission_contact_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for the contact details of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_id">submission_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_contact.submission_id references submission.submission_id via submission_id_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="contact_type_code">contact_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_contact.contact_type_code references contact_type_code.contact_type_code via submission_contact_contact_type_code_fk"><a href='contact_type_code.html'>contact_type_code</a><span class='relatedKey'>.contact_type_code</span></td>
-                                                <td class="constraint detail">submission_contact_contact_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a role of a client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="first_name">first_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The first name of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="last_name">last_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The last name of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="business_phone_number">business_phone_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The phone number of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_address">email_address</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The email address of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="idp_user_id">idp_user_id</span></td>
-                                    <td>varchar</td>
-                                    <td>50</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The unique identifier assigned to a user by the Identity Provider.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="secondary_phone_number">secondary_phone_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A secondary phone number of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="fax_number">fax_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The fax number of the client&rsquo;s contact.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_contact_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_contact_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="289,56,647,419">
-<area shape="rect" id="node2" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="12,199,239,316">
-<area shape="rect" id="node3" href="submission.html" target="_top" title="submission" alt="" coords="5,5,245,181">
-<area shape="rect" id="node4" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="691,29,1037,152">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_contact.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="320,149,560,325">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,144,276,232">
-<area shape="rect" id="node3" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,249,269,337">
-<area shape="rect" id="node4" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="604,321,961,684">
-<area shape="rect" id="node5" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="327,383,553,500">
-<area shape="rect" id="node6" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="671,111,894,199">
-<area shape="rect" id="node7" href="submission_location.html" target="_top" title="submission_location" alt="" coords="662,5,903,93">
-<area shape="rect" id="node8" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1005,149,1352,272">
-<area shape="rect" id="node9" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="631,216,935,304">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_contact.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_detail.html b/schema/nrfc/tables/submission_detail.html
deleted file mode 100644
index 2c8dce23d5..0000000000
--- a/schema/nrfc/tables/submission_detail.html
+++ /dev/null
@@ -1,694 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_detail - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_detail</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>The details of a submission request to create a client.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_detail_id">submission_detail_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.submission_detail_id_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission detail of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_id">submission_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.submission_id references submission.submission_id via submission_id_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="client_number">client_number</span></td>
-                                    <td>varchar</td>
-                                    <td>8</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="business_type_code">business_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>1</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.business_type_code references business_type_code.business_type_code via submission_detail_business_type_code_fk"><a href='business_type_code.html'>business_type_code</a><span class='relatedKey'>.business_type_code</span></td>
-                                                <td class="constraint detail">submission_detail_business_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="incorporation_number">incorporation_number</span></td>
-                                    <td>varchar</td>
-                                    <td>13</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A number provided to B.C. corporations, businesses or societies as part of the registration or incorporation process.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="organization_name">organization_name</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The name of the client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="client_type_code">client_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.client_type_code references client_type_code.client_type_code via submission_detail_client_type_code_fk"><a href='client_type_code.html'>client_type_code</a><span class='relatedKey'>.client_type_code</span></td>
-                                                <td class="constraint detail">submission_detail_client_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the type of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="good_standing_ind">good_standing_ind</span></td>
-                                    <td>varchar</td>
-                                    <td>1</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>An indicator that determines whether a client is in good standing with respect to their financial obligations.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="birthdate">birthdate</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date that the BC Services Card logged in person was born.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="district_code">district_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.district_code references district_code.district_code via submission_detail_district_code_fk"><a href='district_code.html'>district_code</a><span class='relatedKey'>.district_code</span></td>
-                                                <td class="constraint detail">submission_detail_district_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the natural resource district of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="work_safe_bc_number">work_safe_bc_number</span></td>
-                                    <td>varchar</td>
-                                    <td>6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A Work Safe BC number of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="doing_business_as">doing_business_as</span></td>
-                                    <td>varchar</td>
-                                    <td>120</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>An alternate name that a client may be conducting business under. For example: John Smith doing business as: John&rsquo;s Logging.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="client_acronym">client_acronym</span></td>
-                                    <td>varchar</td>
-                                    <td>8</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A familiar alphabetic acronym to be used as an alternative to the ministry&rsquo;s client number for data entry and display.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="first_name">first_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The first name of the client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="middle_name">middle_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The middle name of the client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="last_name">last_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The last name of the client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="notes">notes</span></td>
-                                    <td>varchar</td>
-                                    <td>4000</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Any additional information about the client or specific instructions.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="identification_type_code">identification_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>4</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.identification_type_code references identification_type_code.identification_type_code via identification_type_code_fk"><a href='identification_type_code.html'>identification_type_code</a><span class='relatedKey'>.identification_type_code</span></td>
-                                                <td class="constraint detail">identification_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code indicating the identification type of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="client_identification">client_identification</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The reference number that identifies a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="identification_country_code">identification_country_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.[identification_country_code, identification_province_code] references province_code.[country_code, province_code] via province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a country.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="identification_province_code">identification_province_code</span></td>
-                                    <td>varchar</td>
-                                    <td>4</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_detail.[identification_country_code, identification_province_code] references province_code.[country_code, province_code] via province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.province_code</span></td>
-                                                <td class="constraint detail">province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a province, state, department or territory.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_detail_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_detail_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                    <li class=""><a href="#oneimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">One implied</a></li>
-                                    <li class=""><a href="#twoimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="323,155,707,840">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="25,199,259,316">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="37,333,247,451">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="42,468,242,585">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="42,767,242,913">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="5,603,279,749">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="22,5,262,181">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_detail.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="357,607,557,753">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="47,495,234,583">
-<area shape="rect" id="node3" href="submission.html" target="_top" title="submission" alt="" coords="337,108,577,284">
-<area shape="rect" id="node4" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,103,276,191">
-<area shape="rect" id="node5" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,208,269,296">
-<area shape="rect" id="node6" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="711,5,948,93">
-<area shape="rect" id="node7" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="637,321,1021,1007">
-<area shape="rect" id="node8" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,337,574,455">
-<area shape="rect" id="node9" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,472,562,589">
-<area shape="rect" id="node10" href="district_code.html" target="_top" title="district_code" alt="" coords="357,771,557,888">
-<area shape="rect" id="node11" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,905,593,1052">
-<area shape="rect" id="node12" href="submission_location.html" target="_top" title="submission_location" alt="" coords="709,216,950,304">
-<area shape="rect" id="node13" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="677,111,981,199">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_detail.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="oneimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagramImplied" name="oneDegreeRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="323,155,707,840">
-<area shape="rect" id="node2" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="25,199,259,316">
-<area shape="rect" id="node3" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="37,333,247,451">
-<area shape="rect" id="node4" href="district_code.html" target="_top" title="district_code" alt="" coords="42,468,242,585">
-<area shape="rect" id="node5" href="province_code.html" target="_top" title="province_code" alt="" coords="42,767,242,913">
-<area shape="rect" id="node6" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="5,603,279,749">
-<area shape="rect" id="node7" href="submission.html" target="_top" title="submission" alt="" coords="22,5,262,181">
-</map>
-                                        <a name='diagram'><img id="oneimpliedDegreeImg" src="../diagrams/tables/submission_detail.implied1degrees.png" usemap="#oneDegreeRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twoimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagramImplied" name="twoDegreesRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,447,593,593">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="47,643,234,731">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="357,611,557,757">
-<area shape="rect" id="node4" href="submission.html" target="_top" title="submission" alt="" coords="337,811,577,987">
-<area shape="rect" id="node5" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,804,276,892">
-<area shape="rect" id="node6" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,909,269,997">
-<area shape="rect" id="node7" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="711,813,948,901">
-<area shape="rect" id="node8" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="637,5,1021,691">
-<area shape="rect" id="node9" href="business_type_code.html" target="_top" title="business_type_code" alt="" coords="339,43,574,160">
-<area shape="rect" id="node10" href="client_type_code.html" target="_top" title="client_type_code" alt="" coords="351,177,562,295">
-<area shape="rect" id="node11" href="district_code.html" target="_top" title="district_code" alt="" coords="357,312,557,429">
-<area shape="rect" id="node12" href="submission_location.html" target="_top" title="submission_location" alt="" coords="709,708,950,796">
-<area shape="rect" id="node13" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="677,919,981,1007">
-</map>
-                                        <a name='diagram'><img id="twoimpliedDegreeImg" src="../diagrams/tables/submission_detail.implied2degrees.png" usemap="#twoDegreesRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_location.html b/schema/nrfc/tables/submission_location.html
deleted file mode 100644
index d64dab2c17..0000000000
--- a/schema/nrfc/tables/submission_location.html
+++ /dev/null
@@ -1,573 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_location - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_location</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>The details of a client&rsquo;s location.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_location_id">submission_location_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.submission_location_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location_contact_xref.submission_location_id references submission_location.submission_location_id via submission_location_id_fk"><a href='submission_location_contact_xref.html'>submission_location_contact_xref</a><span class='relatedKey'>.submission_location_id</span></td>
-                                                <td class="constraint detail">submission_location_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a location of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_id">submission_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location.submission_id references submission.submission_id via submission_id_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="street_address">street_address</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The address of a client, including the street number and street name.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="country_code">country_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                            <tr>
-                                                <td title="submission_location.country_code references country_code.country_code via submission_location_country_code_fk"><a href='country_code.html'>country_code</a><span class='relatedKey'>.country_code</span></td>
-                                                <td class="constraint detail">submission_location_country_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a country.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="province_code">province_code</span></td>
-                                    <td>varchar</td>
-                                    <td>2</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location.[country_code, province_code] references province_code.[country_code, province_code] via submission_location_province_code_fk"><a href='province_code.html'>province_code</a><span class='relatedKey'>.province_code</span></td>
-                                                <td class="constraint detail">submission_location_province_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the code of a province, state, department or territory.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="city_name">city_name</span></td>
-                                    <td>varchar</td>
-                                    <td>30</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The name of the city of the location.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="postal_code">postal_code</span></td>
-                                    <td>varchar</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="location_name">location_name</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The location name of an address. Examples of location names include, but are not limited to, Mailing Address, Billing Address among others.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="business_phone_number">business_phone_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The phone number of a client&rsquo;s specific location.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="secondary_phone_number">secondary_phone_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A secondary phone number of a client&rsquo;s specific location.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="fax_number">fax_number</span></td>
-                                    <td>varchar</td>
-                                    <td>14</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The fax number of a client&rsquo;s specific location.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="notes">notes</span></td>
-                                    <td>varchar</td>
-                                    <td>4000</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Any additional information about the client&rsquo;s location or specific instructions for contacting them.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="complementary_address_1">complementary_address_1</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A complementary address line of a client</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="complementary_address_2">complementary_address_2</span></td>
-                                    <td>varchar</td>
-                                    <td>40</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A second complementary address line of a client</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="email_address">email_address</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The email address of the client&rsquo;s location.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_location_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_location_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                    <li class=""><a href="#oneimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">One implied</a></li>
-                                    <li class=""><a href="#twoimpliedDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two implied</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="269,235,469,381">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,212,205,359">
-<area shape="rect" id="node3" href="submission_location.html" target="_top" title="submission_location" alt="" coords="533,91,900,600">
-<area shape="rect" id="node4" href="submission.html" target="_top" title="submission" alt="" coords="249,5,489,181">
-<area shape="rect" id="node5" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="944,93,1291,216">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_location.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="343,383,537,471">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="47,348,234,436">
-<area shape="rect" id="node3" href="submission.html" target="_top" title="submission" alt="" coords="320,147,560,323">
-<area shape="rect" id="node4" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,120,276,208">
-<area shape="rect" id="node5" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,225,269,313">
-<area shape="rect" id="node6" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="669,5,906,93">
-<area shape="rect" id="node7" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="676,743,899,831">
-<area shape="rect" id="node8" href="submission_location.html" target="_top" title="submission_location" alt="" coords="604,216,971,725">
-<area shape="rect" id="node9" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1015,96,1361,219">
-<area shape="rect" id="node10" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="635,111,939,199">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_location.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="oneimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagramImplied" name="oneDegreeRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="269,235,469,381">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,212,205,359">
-<area shape="rect" id="node3" href="submission_location.html" target="_top" title="submission_location" alt="" coords="533,91,900,600">
-<area shape="rect" id="node4" href="submission.html" target="_top" title="submission" alt="" coords="249,5,489,181">
-<area shape="rect" id="node5" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="944,93,1291,216">
-</map>
-                                        <a name='diagram'><img id="oneimpliedDegreeImg" src="../diagrams/tables/submission_location.implied1degrees.png" usemap="#oneDegreeRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twoimpliedDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagramImplied" name="twoDegreesRelationshipsDiagramImplied">
-<area shape="rect" id="node1" href="identification_type_code.html" target="_top" title="identification_type_code" alt="" coords="320,377,593,465">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="47,223,234,311">
-<area shape="rect" id="node3" href="province_code.html" target="_top" title="province_code" alt="" coords="360,223,553,311">
-<area shape="rect" id="node4" href="submission.html" target="_top" title="submission" alt="" coords="337,583,577,759">
-<area shape="rect" id="node5" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,576,276,664">
-<area shape="rect" id="node6" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,681,269,769">
-<area shape="rect" id="node7" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="702,637,939,725">
-<area shape="rect" id="node8" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="709,532,932,620">
-<area shape="rect" id="node9" href="submission_location.html" target="_top" title="submission_location" alt="" coords="637,5,1004,515">
-<area shape="rect" id="node10" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="1048,307,1395,429">
-<area shape="rect" id="node11" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="669,743,973,831">
-</map>
-                                        <a name='diagram'><img id="twoimpliedDegreeImg" src="../diagrams/tables/submission_location.implied2degrees.png" usemap="#twoDegreesRelationshipsDiagramImplied" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_location_contact_xref.html b/schema/nrfc/tables/submission_location_contact_xref.html
deleted file mode 100644
index 8a4d263b48..0000000000
--- a/schema/nrfc/tables/submission_location_contact_xref.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_location_contact_xref - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_location_contact_xref</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>Identifies the multiple addresses for a given client, as well as the many contacts that may belong to a given address.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_location_id">submission_location_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location_contact_xref.submission_location_id references submission_location.submission_location_id via submission_location_id_fk"><a href='submission_location.html'>submission_location</a><span class='relatedKey'>.submission_location_id</span></td>
-                                                <td class="constraint detail">submission_location_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a location of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_contact_id">submission_contact_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_location_contact_xref.submission_contact_id references submission_contact.submission_contact_id via submission_contact_id_fk"><a href='submission_contact.html'>submission_contact</a><span class='relatedKey'>.submission_contact_id</span></td>
-                                                <td class="constraint detail">submission_contact_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for the contact details of a client.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_location_contact_xref_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span>/<span title='Ascending'>Asc</span></td>
-                                    <td>submission_location_id + submission_contact_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="309,100,692,228">
-<area shape="rect" id="node2" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="6,228,265,404">
-<area shape="rect" id="node3" href="submission_location.html" target="_top" title="submission_location" alt="" coords="5,5,265,211">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_location_contact_xref.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="province_code.html" target="_top" title="province_code" alt="" coords="253,301,446,389">
-<area shape="rect" id="node2" href="country_code.html" target="_top" title="country_code" alt="" coords="5,265,192,353">
-<area shape="rect" id="node3" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="507,5,766,181">
-<area shape="rect" id="node4" href="contact_type_code.html" target="_top" title="contact_type_code" alt="" coords="236,55,463,143">
-<area shape="rect" id="node5" href="submission.html" target="_top" title="submission" alt="" coords="265,160,434,248">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="507,199,767,404">
-<area shape="rect" id="node7" href="submission_location_contact_xref.html" target="_top" title="submission_location_contact_xref" alt="" coords="811,85,1193,213">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_location_contact_xref.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_matching_detail.html b/schema/nrfc/tables/submission_matching_detail.html
deleted file mode 100644
index dc9347218f..0000000000
--- a/schema/nrfc/tables/submission_matching_detail.html
+++ /dev/null
@@ -1,417 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_matching_detail - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_matching_detail</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <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>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_matching_detail_id">submission_matching_detail_id</span></td>
-                                    <td>serial</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title='Automatically updated by the database'>√</td>
-                                    <td>nextval(&#39;nrfc.submission_matching_detail_id_seq&#39;::regclass)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission matching detail of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td class='foreignKey' title='Foreign Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_id">submission_id</span></td>
-                                    <td>int4</td>
-                                    <td>10</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission_matching_detail.submission_id references submission.submission_id via submission_id_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_id</span></td>
-                                                <td class="constraint detail">submission_id_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td><p>Incremental id generated for a submission of a client.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="matching_fields">matching_fields</span></td>
-                                    <td>jsonb</td>
-                                    <td>2147483647</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A JSON object provides information about matches found in the existing database. The matches can result from fuzzy search, like matching a name pattern, or from exact equality, such as matching incorporation number or good standing status.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="confirmed_match_status_ind">confirmed_match_status_ind</span></td>
-                                    <td>varchar</td>
-                                    <td>1</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="confirmed_match_message">confirmed_match_message</span></td>
-                                    <td>varchar</td>
-                                    <td>1000</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A field with the reason for the denial of the submission.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="confirmed_match_timestamp">confirmed_match_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The timestamp when the changes happened.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="confirmed_match_userid">confirmed_match_userid</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The ID of the user submitting the changes.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="submission_matching_processed">submission_matching_processed</span></td>
-                                    <td>bool</td>
-                                    <td>1</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>false</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A flag to indicate that the submission was finally processed.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="submission_matching_processed_time">submission_matching_processed_time</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The timestamp of when the processor started to process this specific entry</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_matching_detail_id_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_matching_detail_id</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="289,5,784,339">
-<area shape="rect" id="node2" href="submission.html" target="_top" title="submission" alt="" coords="5,37,245,213">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_matching_detail.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="320,161,560,337">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,155,276,243">
-<area shape="rect" id="node3" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="13,260,269,348">
-<area shape="rect" id="node4" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="733,5,970,93">
-<area shape="rect" id="node5" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="740,111,963,199">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="731,216,972,304">
-<area shape="rect" id="node7" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="604,321,1099,655">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_matching_detail.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_status_code.html b/schema/nrfc/tables/submission_status_code.html
deleted file mode 100644
index c547610724..0000000000
--- a/schema/nrfc/tables/submission_status_code.html
+++ /dev/null
@@ -1,400 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_status_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_status_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A code indicating the status of a client creation submission request. Examples of possible statuses include Approved, Rejected, and others.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_status_code">submission_status_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission.submission_status_code references submission_status_code.submission_status_code via submission_submission_status_code_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_status_code</span></td>
-                                                <td class="constraint detail">submission_submission_status_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the status of a submission request.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_status_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_status_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="416,5,656,181">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,32,372,336">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_status_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="416,161,656,337">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="5,44,372,348">
-<area shape="rect" id="node3" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="61,365,317,453">
-<area shape="rect" id="node4" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="733,5,971,93">
-<area shape="rect" id="node5" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="741,111,963,199">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="731,216,973,304">
-<area shape="rect" id="node7" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="700,321,1004,409">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_status_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/tables/submission_type_code.html b/schema/nrfc/tables/submission_type_code.html
deleted file mode 100644
index 464698f1f6..0000000000
--- a/schema/nrfc/tables/submission_type_code.html
+++ /dev/null
@@ -1,400 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>submission_type_code - default.nrfc</title>
-        <!-- Tell the browser to be responsive to screen width -->
-        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-        <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
-        <!-- Bootstrap 3.3.5 -->
-        <link rel="stylesheet" href="../bower/admin-lte/bootstrap/css/bootstrap.min.css">
-        <!-- Font Awesome -->
-        <link rel="stylesheet" href="../bower/font-awesome/css/font-awesome.min.css">
-        <!-- Ionicons -->
-        <link rel="stylesheet" href="../bower/ionicons/css/ionicons.min.css">
-        <!-- DataTables -->
-        <link rel="stylesheet" href="../bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
-        <link rel="stylesheet" href="../bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
-        <!-- Code Mirror -->
-        <link rel="stylesheet" href="../bower/codemirror/codemirror.css">
-        <!-- Fonts -->
-        <link href='../fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
-        <link href='../fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
-
-        <!-- Theme style -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/AdminLTE.min.css">
-        <!-- Salvattore -->
-        <link rel="stylesheet" href="../bower/salvattore/salvattore.css">
-        <!-- AdminLTE Skins. Choose a skin from the css/skins
-           folder instead of downloading all of them to reduce the load. -->
-        <link rel="stylesheet" href="../bower/admin-lte/dist/css/skins/_all-skins.min.css">
-        <!-- SchemaSpy -->
-        <link rel="stylesheet" href="../schemaSpy.css">
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="../bower/html5shiv/html5shiv.min.js"></script>
-        <script src="../bower/respond/respond.min.js"></script>
-        <![endif]-->
-    </head>
-    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
-    <body class="hold-transition skin-blue layout-top-nav">
-        <div class="wrapper">
-            <header class="main-header">
-                <nav class="navbar navbar-static-top">
-                    <div class="container">
-                        <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
-                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
-                        </div>
-
-                        <!-- Collect the nav links, forms, and other content for toggling -->
-                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="../index.html">Tables <span class="sr-only">(current)</span></a></li>
-                                <li><a href="../columns.html" title="All of the columns in the schema">Columns</a></li>
-                                <li><a href="../constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
-                                <li><a href="../relationships.html" title="Diagram of table relationships">Relationships</a></li>
-                                <li><a href="../orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
-                                <li><a href="../anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
-                                <li><a href="../routines.html" title="Procedures and functions">Routines</a></li>
-                            </ul>
-                        </div>
-                        <!-- /.navbar-collapse -->
-                        <!-- Navbar Right Menu -->
-                    </div>
-                    <!-- /.container-fluid -->
-                </nav>
-            </header>
-            <!-- Main content -->
-            <!-- Full Width Column -->
-            <div class="content-wrapper">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1>submission_type_code</h1><p><span id="recordNumber">-1</span> rows</p><br />
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-file-text-o"></i>
-                            <h3 id="Description" class="box-title">Description</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div><!-- /.box-header -->
-                        <div class="box-body clearfix">
-                            <p>A code indicating the type of a submission request. Examples of possible type are TBD.</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <!-- Main content -->
-                <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
-                            <h3 id="Columns" class="box-title">Columns</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="standard_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead align='left'>
-                                <tr>
-                                    <th>Column</th>
-                                    <th>Type</th>
-                                    <th>Size</th>
-                                    <th title='Are nulls allowed?'>Nulls</th>
-                                    <th title='Is column automatically updated?'>Auto</th>
-                                    <th title='Default value'>Default</th>
-                                    <th title='Columns in tables that reference this column'>Children</th>
-                                    <th title='Columns in tables that are referenced by this column'>Parents</th>
-                                    <th title='Comments' class="toggle"><span>Comments</span></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey' style='padding-left: 5px;'></i><span id="submission_type_code">submission_type_code</span></td>
-                                    <td>varchar</td>
-                                    <td>5</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                            <tr>
-                                                <td title="submission.submission_type_code references submission_type_code.submission_type_code via submission_submission_type_code_fk"><a href='submission.html'>submission</a><span class='relatedKey'>.submission_type_code</span></td>
-                                                <td class="constraint detail">submission_submission_type_code_fk</td>
-                                                <td class="constraint detail"><span title='Restrict delete:&#10;Parent cannot be deleted if children exist'>R</span></td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>A code representing the type of a submission request.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="description">description</span></td>
-                                    <td>varchar</td>
-                                    <td>100</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The description of the code value.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="effective_date">effective_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><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></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="expiry_date">expiry_date</span></td>
-                                    <td>date</td>
-                                    <td>13</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>to_date(&#39;99991231&#39;::text, &#39;YYYYMMDD&#39;::text)</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date on which the code value has expired or is expected to expire.  Default 9999-12-31.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_timestamp">create_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_timestamp">update_timestamp</span></td>
-                                    <td>timestamp</td>
-                                    <td>29,6</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>CURRENT_TIMESTAMP</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The date and time the record was created or last updated.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="create_user">create_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title=''></td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created the record.</p></td>
-                                </tr>
-                                <tr>
-                                    <td><span id="update_user">update_user</span></td>
-                                    <td>varchar</td>
-                                    <td>60</td>
-                                    <td title='nullable'>√</td>
-                                    <td title=''></td>
-                                    <td>null</td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td>
-                                        <table border='0' cellspacing='0' cellpadding='0'>
-                                        </table>
-                                    </td>
-                                    <td><p>The user or proxy account that created or last updated the record.</p></td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-sitemap"></i>
-                            <h3 id="Indexes" class="box-title">Indexes</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <table
-                                    id="indexes_table"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="10"
-                                    data-length-change="false">
-                                <thead>
-                                <tr>
-                                    <th>Constraint Name</th>
-                                    <th>Type</th>
-                                    <th>Sort</th>
-                                    <th>Column(s)</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr>
-                                    <td class='primaryKey' title='Primary Key'><i class='icon ion-key iconkey'></i> submission_type_code_pk</td>
-                                    <td>Primary key</td>
-                                    <td><span title='Ascending'>Asc</span></td>
-                                    <td>submission_type_code</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <i class="fa fa-code-fork"></i>
-                            <h3 id="Relationships" class="box-title">Relationships</h3>
-                            <div class="box-tools pull-right">
-                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
-                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
-                            </div>
-                        </div>
-                        <div class="box-body">
-                            <div class="nav-tabs-custom"><!-- Tabs within a box -->
-                                <h5>Close relationships within degrees of separation</h5>
-                                <ul class="nav nav-tabs pull-left ui-sortable-handle">
-                                    <li class="active"><a href="#oneDegreeImg-chart" data-toggle="tab" aria-expanded="true">One</a></li>
-                                    <li class=""><a href="#twodegreesDegreeImg-chart" data-toggle="tab" aria-expanded="true">Two degrees</a></li>
-                                </ul>
-                                <div class="tab-content no-padding">
-                                    <div class="chart tab-pane active" id="oneDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="oneDegreeRelationshipsDiagram" name="oneDegreeRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="401,5,641,181">
-<area shape="rect" id="node2" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="5,61,357,365">
-</map>
-                                        <a name='diagram'><img id="oneDegreeImg" src="../diagrams/tables/submission_type_code.1degree.png" usemap="#oneDegreeRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                    <div class="chart tab-pane " id="twodegreesDegreeImg-chart" style="position: relative; overflow-x:auto;">
-                                        <map id="twoDegreesRelationshipsDiagram" name="twoDegreesRelationshipsDiagram">
-<area shape="rect" id="node1" href="submission.html" target="_top" title="submission" alt="" coords="401,161,641,337">
-<area shape="rect" id="node2" href="submission_status_code.html" target="_top" title="submission_status_code" alt="" coords="46,152,317,240">
-<area shape="rect" id="node3" href="submission_type_code.html" target="_top" title="submission_type_code" alt="" coords="5,257,357,561">
-<area shape="rect" id="node4" href="submission_contact.html" target="_top" title="submission_contact" alt="" coords="719,5,956,93">
-<area shape="rect" id="node5" href="submission_detail.html" target="_top" title="submission_detail" alt="" coords="726,111,949,199">
-<area shape="rect" id="node6" href="submission_location.html" target="_top" title="submission_location" alt="" coords="717,216,958,304">
-<area shape="rect" id="node7" href="submission_matching_detail.html" target="_top" title="submission_matching_detail" alt="" coords="685,321,989,409">
-</map>
-                                        <a name='diagram'><img id="twodegreesDegreeImg" src="../diagrams/tables/submission_type_code.2degrees.png" usemap="#twoDegreesRelationshipsDiagram" class="diagram" border="0" align="left"></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-                    </div>
-                </section>
-                <script>
-                    var config = {
-                        pagination: true
-                    }
-                </script>
-            </div>
-            <!-- /.content-wrapper -->
-            <footer class="main-footer">
-                <div>
-                    <div class="pull-right hidden-xs">
-                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
-                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
-                    </div>
-                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
-                </div>
-                <!-- /.container -->
-            </footer>
-        </div>
-        <!-- ./wrapper -->
-
-        <!-- jQuery 2.2.3 -->
-        <script src="../bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
-        <script src="../bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
-        <!-- Bootstrap 3.3.5 -->
-        <script src="../bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
-        <!-- DataTables -->
-        <script src="../bower/datatables.net/jquery.dataTables.min.js"></script>
-        <script src="../bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
-        <script src="../bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.html5.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.print.min.js"></script>
-        <script src="../bower/datatables.net-buttons/buttons.colVis.min.js"></script>
-        <!-- SheetJS -->
-        <script src="../bower/js-xlsx/xlsx.full.min.js"></script>
-        <!-- pdfmake -->
-        <script src="../bower/pdfmake/pdfmake.min.js"></script>
-        <script src="../bower/pdfmake/vfs_fonts.js"></script>
-        <!-- SlimScroll -->
-        <script src="../bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
-        <!-- FastClick -->
-        <script src="../bower/admin-lte/plugins/fastclick/fastclick.js"></script>
-        <!-- Salvattore -->
-        <script src="../bower/salvattore/salvattore.min.js"></script>
-        <!-- AnchorJS -->
-        <script src="../bower/anchor-js/anchor.min.js"></script>
-        <!-- CodeMirror -->
-        <script src="../bower/codemirror/codemirror.js"></script>
-        <script src="../bower/codemirror/sql.js"></script>
-        <!-- AdminLTE App -->
-        <script src="../bower/admin-lte/dist/js/app.min.js"></script>
-        <script src="table.js"></script>
-        <script src="../schemaSpy.js"></script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/schema/nrfc/schemaSpy.css b/schemaSpy.css
similarity index 100%
rename from schema/nrfc/schemaSpy.css
rename to schemaSpy.css
diff --git a/schema/nrfc/schemaSpy.js b/schemaSpy.js
similarity index 100%
rename from schema/nrfc/schemaSpy.js
rename to schemaSpy.js
diff --git a/schema/nrfc/tables/table.js b/tables/table.js
similarity index 100%
rename from schema/nrfc/tables/table.js
rename to tables/table.js
diff --git a/schema/nrfc/anomalies.html b/users/anomalies.html
similarity index 97%
rename from schema/nrfc/anomalies.html
rename to users/anomalies.html
index ab1c9c5293..f3faf377be 100644
--- a/schema/nrfc/anomalies.html
+++ b/users/anomalies.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
+        <title>default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
@@ -46,7 +46,7 @@
                 <nav class="navbar navbar-static-top">
                     <div class="container">
                         <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
                             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
                         </div>
 
@@ -106,8 +106,7 @@ <h3 class="box-title">Columns whose name and type imply a relationship to anothe
                                         </thead>
                                         <tbody>
                                             <tr>
-                                                <td><a href='tables/identification_type_code.html'>identification_type_code</a>.[country_code]</td>
-                                                <td><a href='tables/country_code.html'>country_code</a>.[country_code]</td>
+                                                <td colspan="3">Anomaly not detected</td>
                                             </tr>
                                         </tbody>
                                     </table>
@@ -202,7 +201,7 @@ <h3 class="box-title">Tables with incrementing column names, potentially indicat
                                         </thead>
                                         <tbody>
                                             <tr>
-                                                <td><a href='tables/submission_location.html'>submission_location</a></td>
+                                                <td colspan="3">Anomaly not detected</td>
                                             </tr>
                                         </tbody>
                                     </table>
diff --git a/schema/nrfc/anomalies.js b/users/anomalies.js
similarity index 100%
rename from schema/nrfc/anomalies.js
rename to users/anomalies.js
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.css b/users/bower/admin-lte/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.css
rename to users/bower/admin-lte/bootstrap/css/bootstrap-theme.css
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map b/users/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
rename to users/bower/admin-lte/bootstrap/css/bootstrap-theme.css.map
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css b/users/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
rename to users/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map b/users/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
rename to users/bower/admin-lte/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.css b/users/bower/admin-lte/bootstrap/css/bootstrap.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.css
rename to users/bower/admin-lte/bootstrap/css/bootstrap.css
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.css.map b/users/bower/admin-lte/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.css.map
rename to users/bower/admin-lte/bootstrap/css/bootstrap.css.map
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.min.css b/users/bower/admin-lte/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.min.css
rename to users/bower/admin-lte/bootstrap/css/bootstrap.min.css
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.min.css.map b/users/bower/admin-lte/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/css/bootstrap.min.css.map
rename to users/bower/admin-lte/bootstrap/css/bootstrap.min.css.map
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot b/users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg b/users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf b/users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff b/users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to users/bower/admin-lte/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/js/bootstrap.js b/users/bower/admin-lte/bootstrap/js/bootstrap.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/js/bootstrap.js
rename to users/bower/admin-lte/bootstrap/js/bootstrap.js
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/js/bootstrap.min.js b/users/bower/admin-lte/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/js/bootstrap.min.js
rename to users/bower/admin-lte/bootstrap/js/bootstrap.min.js
diff --git a/schema/nrfc/bower/admin-lte/bootstrap/js/npm.js b/users/bower/admin-lte/bootstrap/js/npm.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/bootstrap/js/npm.js
rename to users/bower/admin-lte/bootstrap/js/npm.js
diff --git a/schema/nrfc/bower/admin-lte/dist/css/AdminLTE.css b/users/bower/admin-lte/dist/css/AdminLTE.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/AdminLTE.css
rename to users/bower/admin-lte/dist/css/AdminLTE.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/AdminLTE.min.css b/users/bower/admin-lte/dist/css/AdminLTE.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/AdminLTE.min.css
rename to users/bower/admin-lte/dist/css/AdminLTE.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-bootstrap-social.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-fullcalendar.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-select2.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-select2.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-select2.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-select2.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-select2.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css b/users/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
rename to users/bower/admin-lte/dist/css/alt/AdminLTE-without-plugins.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/_all-skins.css b/users/bower/admin-lte/dist/css/skins/_all-skins.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/_all-skins.css
rename to users/bower/admin-lte/dist/css/skins/_all-skins.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/_all-skins.min.css b/users/bower/admin-lte/dist/css/skins/_all-skins.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/_all-skins.min.css
rename to users/bower/admin-lte/dist/css/skins/_all-skins.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-black-light.css b/users/bower/admin-lte/dist/css/skins/skin-black-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-black-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-black-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-black-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-black-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-black-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-black-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-black.css b/users/bower/admin-lte/dist/css/skins/skin-black.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-black.css
rename to users/bower/admin-lte/dist/css/skins/skin-black.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-black.min.css b/users/bower/admin-lte/dist/css/skins/skin-black.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-black.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-black.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue-light.css b/users/bower/admin-lte/dist/css/skins/skin-blue-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-blue-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-blue-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-blue-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue.css b/users/bower/admin-lte/dist/css/skins/skin-blue.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue.css
rename to users/bower/admin-lte/dist/css/skins/skin-blue.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue.min.css b/users/bower/admin-lte/dist/css/skins/skin-blue.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-blue.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-blue.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-green-light.css b/users/bower/admin-lte/dist/css/skins/skin-green-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-green-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-green-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-green-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-green-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-green-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-green-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-green.css b/users/bower/admin-lte/dist/css/skins/skin-green.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-green.css
rename to users/bower/admin-lte/dist/css/skins/skin-green.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-green.min.css b/users/bower/admin-lte/dist/css/skins/skin-green.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-green.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-green.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple-light.css b/users/bower/admin-lte/dist/css/skins/skin-purple-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-purple-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-purple-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-purple-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple.css b/users/bower/admin-lte/dist/css/skins/skin-purple.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple.css
rename to users/bower/admin-lte/dist/css/skins/skin-purple.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple.min.css b/users/bower/admin-lte/dist/css/skins/skin-purple.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-purple.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-purple.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-red-light.css b/users/bower/admin-lte/dist/css/skins/skin-red-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-red-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-red-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-red-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-red-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-red-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-red-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-red.css b/users/bower/admin-lte/dist/css/skins/skin-red.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-red.css
rename to users/bower/admin-lte/dist/css/skins/skin-red.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-red.min.css b/users/bower/admin-lte/dist/css/skins/skin-red.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-red.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-red.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow-light.css b/users/bower/admin-lte/dist/css/skins/skin-yellow-light.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow-light.css
rename to users/bower/admin-lte/dist/css/skins/skin-yellow-light.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css b/users/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-yellow-light.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow.css b/users/bower/admin-lte/dist/css/skins/skin-yellow.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow.css
rename to users/bower/admin-lte/dist/css/skins/skin-yellow.css
diff --git a/schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow.min.css b/users/bower/admin-lte/dist/css/skins/skin-yellow.min.css
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/css/skins/skin-yellow.min.css
rename to users/bower/admin-lte/dist/css/skins/skin-yellow.min.css
diff --git a/schema/nrfc/bower/admin-lte/dist/js/app.js b/users/bower/admin-lte/dist/js/app.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/js/app.js
rename to users/bower/admin-lte/dist/js/app.js
diff --git a/schema/nrfc/bower/admin-lte/dist/js/app.min.js b/users/bower/admin-lte/dist/js/app.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/js/app.min.js
rename to users/bower/admin-lte/dist/js/app.min.js
diff --git a/schema/nrfc/bower/admin-lte/dist/js/demo.js b/users/bower/admin-lte/dist/js/demo.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/js/demo.js
rename to users/bower/admin-lte/dist/js/demo.js
diff --git a/schema/nrfc/bower/admin-lte/dist/js/pages/dashboard.js b/users/bower/admin-lte/dist/js/pages/dashboard.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/js/pages/dashboard.js
rename to users/bower/admin-lte/dist/js/pages/dashboard.js
diff --git a/schema/nrfc/bower/admin-lte/dist/js/pages/dashboard2.js b/users/bower/admin-lte/dist/js/pages/dashboard2.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/dist/js/pages/dashboard2.js
rename to users/bower/admin-lte/dist/js/pages/dashboard2.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/fastclick/fastclick.js b/users/bower/admin-lte/plugins/fastclick/fastclick.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/fastclick/fastclick.js
rename to users/bower/admin-lte/plugins/fastclick/fastclick.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/fastclick/fastclick.min.js b/users/bower/admin-lte/plugins/fastclick/fastclick.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/fastclick/fastclick.min.js
rename to users/bower/admin-lte/plugins/fastclick/fastclick.min.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js b/users/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
rename to users/bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/jQueryUI/jquery-ui.js b/users/bower/admin-lte/plugins/jQueryUI/jquery-ui.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/jQueryUI/jquery-ui.js
rename to users/bower/admin-lte/plugins/jQueryUI/jquery-ui.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js b/users/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
rename to users/bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js b/users/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
rename to users/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.js
diff --git a/schema/nrfc/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js b/users/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
similarity index 100%
rename from schema/nrfc/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
rename to users/bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js
diff --git a/schema/nrfc/bower/anchor-js/anchor.min.js b/users/bower/anchor-js/anchor.min.js
similarity index 100%
rename from schema/nrfc/bower/anchor-js/anchor.min.js
rename to users/bower/anchor-js/anchor.min.js
diff --git a/schema/nrfc/bower/codemirror/codemirror.css b/users/bower/codemirror/codemirror.css
similarity index 100%
rename from schema/nrfc/bower/codemirror/codemirror.css
rename to users/bower/codemirror/codemirror.css
diff --git a/schema/nrfc/bower/codemirror/codemirror.js b/users/bower/codemirror/codemirror.js
similarity index 100%
rename from schema/nrfc/bower/codemirror/codemirror.js
rename to users/bower/codemirror/codemirror.js
diff --git a/schema/nrfc/bower/codemirror/sql.js b/users/bower/codemirror/sql.js
similarity index 100%
rename from schema/nrfc/bower/codemirror/sql.js
rename to users/bower/codemirror/sql.js
diff --git a/schema/nrfc/bower/datatables.net-bs/css/dataTables.bootstrap.css b/users/bower/datatables.net-bs/css/dataTables.bootstrap.css
similarity index 100%
rename from schema/nrfc/bower/datatables.net-bs/css/dataTables.bootstrap.css
rename to users/bower/datatables.net-bs/css/dataTables.bootstrap.css
diff --git a/schema/nrfc/bower/datatables.net-bs/css/dataTables.bootstrap.min.css b/users/bower/datatables.net-bs/css/dataTables.bootstrap.min.css
similarity index 100%
rename from schema/nrfc/bower/datatables.net-bs/css/dataTables.bootstrap.min.css
rename to users/bower/datatables.net-bs/css/dataTables.bootstrap.min.css
diff --git a/schema/nrfc/bower/datatables.net-bs/js/dataTables.bootstrap.js b/users/bower/datatables.net-bs/js/dataTables.bootstrap.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-bs/js/dataTables.bootstrap.js
rename to users/bower/datatables.net-bs/js/dataTables.bootstrap.js
diff --git a/schema/nrfc/bower/datatables.net-bs/js/dataTables.bootstrap.min.js b/users/bower/datatables.net-bs/js/dataTables.bootstrap.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-bs/js/dataTables.bootstrap.min.js
rename to users/bower/datatables.net-bs/js/dataTables.bootstrap.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css b/users/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
rename to users/bower/datatables.net-buttons-bs/css/buttons.bootstrap.css
diff --git a/schema/nrfc/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css b/users/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
rename to users/bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css
diff --git a/schema/nrfc/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js b/users/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
rename to users/bower/datatables.net-buttons-bs/js/buttons.bootstrap.js
diff --git a/schema/nrfc/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js b/users/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
rename to users/bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.colVis.js b/users/bower/datatables.net-buttons/buttons.colVis.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.colVis.js
rename to users/bower/datatables.net-buttons/buttons.colVis.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.colVis.min.js b/users/bower/datatables.net-buttons/buttons.colVis.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.colVis.min.js
rename to users/bower/datatables.net-buttons/buttons.colVis.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.flash.js b/users/bower/datatables.net-buttons/buttons.flash.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.flash.js
rename to users/bower/datatables.net-buttons/buttons.flash.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.flash.min.js b/users/bower/datatables.net-buttons/buttons.flash.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.flash.min.js
rename to users/bower/datatables.net-buttons/buttons.flash.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.html5.js b/users/bower/datatables.net-buttons/buttons.html5.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.html5.js
rename to users/bower/datatables.net-buttons/buttons.html5.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.html5.min.js b/users/bower/datatables.net-buttons/buttons.html5.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.html5.min.js
rename to users/bower/datatables.net-buttons/buttons.html5.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.print.js b/users/bower/datatables.net-buttons/buttons.print.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.print.js
rename to users/bower/datatables.net-buttons/buttons.print.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/buttons.print.min.js b/users/bower/datatables.net-buttons/buttons.print.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/buttons.print.min.js
rename to users/bower/datatables.net-buttons/buttons.print.min.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/dataTables.buttons.js b/users/bower/datatables.net-buttons/dataTables.buttons.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/dataTables.buttons.js
rename to users/bower/datatables.net-buttons/dataTables.buttons.js
diff --git a/schema/nrfc/bower/datatables.net-buttons/dataTables.buttons.min.js b/users/bower/datatables.net-buttons/dataTables.buttons.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net-buttons/dataTables.buttons.min.js
rename to users/bower/datatables.net-buttons/dataTables.buttons.min.js
diff --git a/schema/nrfc/bower/datatables.net/jquery.dataTables.min.js b/users/bower/datatables.net/jquery.dataTables.min.js
similarity index 100%
rename from schema/nrfc/bower/datatables.net/jquery.dataTables.min.js
rename to users/bower/datatables.net/jquery.dataTables.min.js
diff --git a/schema/nrfc/bower/font-awesome/css/font-awesome.css b/users/bower/font-awesome/css/font-awesome.css
similarity index 100%
rename from schema/nrfc/bower/font-awesome/css/font-awesome.css
rename to users/bower/font-awesome/css/font-awesome.css
diff --git a/schema/nrfc/bower/font-awesome/css/font-awesome.css.map b/users/bower/font-awesome/css/font-awesome.css.map
similarity index 100%
rename from schema/nrfc/bower/font-awesome/css/font-awesome.css.map
rename to users/bower/font-awesome/css/font-awesome.css.map
diff --git a/schema/nrfc/bower/font-awesome/css/font-awesome.min.css b/users/bower/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from schema/nrfc/bower/font-awesome/css/font-awesome.min.css
rename to users/bower/font-awesome/css/font-awesome.min.css
diff --git a/schema/nrfc/bower/font-awesome/fonts/FontAwesome.otf b/users/bower/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/FontAwesome.otf
rename to users/bower/font-awesome/fonts/FontAwesome.otf
diff --git a/schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.eot b/users/bower/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.eot
rename to users/bower/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.svg b/users/bower/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.svg
rename to users/bower/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.ttf b/users/bower/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.ttf
rename to users/bower/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.woff b/users/bower/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.woff
rename to users/bower/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.woff2 b/users/bower/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from schema/nrfc/bower/font-awesome/fonts/fontawesome-webfont.woff2
rename to users/bower/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/schema/nrfc/bower/html5shiv/html5shiv.min.js b/users/bower/html5shiv/html5shiv.min.js
similarity index 100%
rename from schema/nrfc/bower/html5shiv/html5shiv.min.js
rename to users/bower/html5shiv/html5shiv.min.js
diff --git a/schema/nrfc/bower/ionicons/css/ionicons.css b/users/bower/ionicons/css/ionicons.css
similarity index 100%
rename from schema/nrfc/bower/ionicons/css/ionicons.css
rename to users/bower/ionicons/css/ionicons.css
diff --git a/schema/nrfc/bower/ionicons/css/ionicons.min.css b/users/bower/ionicons/css/ionicons.min.css
similarity index 100%
rename from schema/nrfc/bower/ionicons/css/ionicons.min.css
rename to users/bower/ionicons/css/ionicons.min.css
diff --git a/schema/nrfc/bower/ionicons/fonts/ionicons.eot b/users/bower/ionicons/fonts/ionicons.eot
similarity index 100%
rename from schema/nrfc/bower/ionicons/fonts/ionicons.eot
rename to users/bower/ionicons/fonts/ionicons.eot
diff --git a/schema/nrfc/bower/ionicons/fonts/ionicons.svg b/users/bower/ionicons/fonts/ionicons.svg
similarity index 100%
rename from schema/nrfc/bower/ionicons/fonts/ionicons.svg
rename to users/bower/ionicons/fonts/ionicons.svg
diff --git a/schema/nrfc/bower/ionicons/fonts/ionicons.ttf b/users/bower/ionicons/fonts/ionicons.ttf
similarity index 100%
rename from schema/nrfc/bower/ionicons/fonts/ionicons.ttf
rename to users/bower/ionicons/fonts/ionicons.ttf
diff --git a/schema/nrfc/bower/ionicons/fonts/ionicons.woff b/users/bower/ionicons/fonts/ionicons.woff
similarity index 100%
rename from schema/nrfc/bower/ionicons/fonts/ionicons.woff
rename to users/bower/ionicons/fonts/ionicons.woff
diff --git a/schema/nrfc/bower/jquery/jquery.js b/users/bower/jquery/jquery.js
similarity index 100%
rename from schema/nrfc/bower/jquery/jquery.js
rename to users/bower/jquery/jquery.js
diff --git a/schema/nrfc/bower/js-xlsx/xlsx.full.min.js b/users/bower/js-xlsx/xlsx.full.min.js
similarity index 100%
rename from schema/nrfc/bower/js-xlsx/xlsx.full.min.js
rename to users/bower/js-xlsx/xlsx.full.min.js
diff --git a/schema/nrfc/bower/pdfmake/pdfmake.min.js b/users/bower/pdfmake/pdfmake.min.js
similarity index 100%
rename from schema/nrfc/bower/pdfmake/pdfmake.min.js
rename to users/bower/pdfmake/pdfmake.min.js
diff --git a/schema/nrfc/bower/pdfmake/vfs_fonts.js b/users/bower/pdfmake/vfs_fonts.js
similarity index 100%
rename from schema/nrfc/bower/pdfmake/vfs_fonts.js
rename to users/bower/pdfmake/vfs_fonts.js
diff --git a/schema/nrfc/bower/respond/respond.min.js b/users/bower/respond/respond.min.js
similarity index 100%
rename from schema/nrfc/bower/respond/respond.min.js
rename to users/bower/respond/respond.min.js
diff --git a/schema/nrfc/bower/salvattore/salvattore.css b/users/bower/salvattore/salvattore.css
similarity index 100%
rename from schema/nrfc/bower/salvattore/salvattore.css
rename to users/bower/salvattore/salvattore.css
diff --git a/schema/nrfc/bower/salvattore/salvattore.min.js b/users/bower/salvattore/salvattore.min.js
similarity index 100%
rename from schema/nrfc/bower/salvattore/salvattore.min.js
rename to users/bower/salvattore/salvattore.min.js
diff --git a/schema/nrfc/column.js b/users/column.js
similarity index 100%
rename from schema/nrfc/column.js
rename to users/column.js
diff --git a/users/columns.html b/users/columns.html
new file mode 100644
index 0000000000..93343915d8
--- /dev/null
+++ b/users/columns.html
@@ -0,0 +1,307 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>default.users</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="bower/html5shiv/html5shiv.min.js"></script>
+        <script src="bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>Columns</h1>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span>
+                            <h3 class="box-title">Columns</h3>
+                        </div>
+                        <div class="box-body">
+                            <table
+                                    id="column_table"
+                                    class="table table-bordered table-striped dataTable"
+                                    role="grid"
+                                    data-paging="true"
+                                    data-page-length="50"
+                                    data-length-change="false">
+                                <thead align='left'>
+                                    <tr>
+                                        <th>Table</th>
+                                        <th>Type</th>
+                                        <th>Column</th>
+                                        <th>Type</th>
+                                        <th>Size</th>
+                                        <th title='Are nulls allowed?'>Nullable</th>
+                                        <th title='Is column automatically updated?'>Auto</th>
+                                        <th title='Default value'>Default</th>
+                                        <th title='Comments' class="toggle"><span>Comments</span></th>
+                                    </tr>
+                                </thead>
+                                <tbody></tbody>
+                            </table>
+                        </div>
+                    </div>
+                </section>
+                <script>
+                    var tableData = [
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "primaryKey",
+        "keyTitle": "Primary Key",
+        "name": "<i class='icon ion-key iconkey' style='padding-left: 5px;'><\/i>installed_rank",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "version",
+        "type": "varchar",
+        "length": 50,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "script",
+        "type": "varchar",
+        "length": 1000,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "execution_time",
+        "type": "int4",
+        "length": 10,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "installed_by",
+        "type": "varchar",
+        "length": 100,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "checksum",
+        "type": "int4",
+        "length": 10,
+        "nullable": "√",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "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,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "type",
+        "type": "varchar",
+        "length": 20,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "installed_on",
+        "type": "timestamp",
+        "length": 29,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "now()",
+        "comments": ""
+    },
+    {
+        "tableName": "flyway_schema_history",
+        "tableFileName": "flyway_schema_history",
+        "tableType": "Table",
+        "keyClass": "",
+        "keyTitle": "",
+        "name": "description",
+        "type": "varchar",
+        "length": 200,
+        "nullable": "",
+        "autoUpdated": "",
+        "defaultValue": "null",
+        "comments": ""
+    }
+];
+                    var config = {
+                        pagination: true
+                    };
+                </script>
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="bower/pdfmake/pdfmake.min.js"></script>
+        <script src="bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="bower/codemirror/codemirror.js"></script>
+        <script src="bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="bower/admin-lte/dist/js/app.min.js"></script>
+        <script src="column.js"></script>
+        <script src="schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/schema/nrfc/constraint.js b/users/constraint.js
similarity index 100%
rename from schema/nrfc/constraint.js
rename to users/constraint.js
diff --git a/users/constraints.html b/users/constraints.html
new file mode 100644
index 0000000000..7315093b72
--- /dev/null
+++ b/users/constraints.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>default.users</title>
+        <!-- Tell the browser to be responsive to screen width -->
+        <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+        <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
+        <!-- Bootstrap 3.3.5 -->
+        <link rel="stylesheet" href="bower/admin-lte/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome -->
+        <link rel="stylesheet" href="bower/font-awesome/css/font-awesome.min.css">
+        <!-- Ionicons -->
+        <link rel="stylesheet" href="bower/ionicons/css/ionicons.min.css">
+        <!-- DataTables -->
+        <link rel="stylesheet" href="bower/datatables.net-bs/css/dataTables.bootstrap.min.css">
+        <link rel="stylesheet" href="bower/datatables.net-buttons-bs/css/buttons.bootstrap.min.css">
+        <!-- Code Mirror -->
+        <link rel="stylesheet" href="bower/codemirror/codemirror.css">
+        <!-- Fonts -->
+        <link href='fonts/indieflower/indie-flower.css' rel='stylesheet' type='text/css'>
+        <link href='fonts/source-sans-pro/source-sans-pro.css' rel='stylesheet' type='text/css'>
+
+        <!-- Theme style -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/AdminLTE.min.css">
+        <!-- Salvattore -->
+        <link rel="stylesheet" href="bower/salvattore/salvattore.css">
+        <!-- AdminLTE Skins. Choose a skin from the css/skins
+           folder instead of downloading all of them to reduce the load. -->
+        <link rel="stylesheet" href="bower/admin-lte/dist/css/skins/_all-skins.min.css">
+        <!-- SchemaSpy -->
+        <link rel="stylesheet" href="schemaSpy.css">
+
+        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+        <!--[if lt IE 9]>
+        <script src="bower/html5shiv/html5shiv.min.js"></script>
+        <script src="bower/respond/respond.min.js"></script>
+        <![endif]-->
+    </head>
+    <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
+    <body class="hold-transition skin-blue layout-top-nav">
+        <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
+            <!-- Main content -->
+            <!-- Full Width Column -->
+            <div class="content-wrapper">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>Constraints</h1>
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="ion ion-key"></i>
+                            <h3 class="box-title">0 Foreign Key Constraints</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <table
+                                    id="fk_table"
+                                    class="table table-bordered table-striped dataTable"
+                                    role="grid"
+                                    data-paging="true"
+                                    data-page-length="50"
+                                    data-length-change="false">
+                                <thead align='left'>
+                                    <tr>
+                                        <th>Constraint Name</th>
+                                        <th>Child Column</th>
+                                        <th>Parent Column</th>
+                                        <th>Delete Rule</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="box box-primary">
+                        <div class="box-header with-border">
+                            <i class="fa fa-sitemap"></i>
+                            <h3 class="box-title">Check Constraints</h3>
+                            <div class="box-tools pull-right">
+                                <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+                                <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                        <div class="box-body">
+                            <table
+                                    id="check_table"
+                                    class="table table-bordered table-striped dataTable"
+                                    role="grid"
+                                    data-paging="true"
+                                    data-page-length="10"
+                                    data-length-change="false">
+                                <thead align='left'>
+                                    <tr>
+                                        <th>Table</th>
+                                        <th>Constraint Name</th>
+                                        <th>Constraint</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </section>
+                <script>
+                    var config = {
+                        pagination: true
+                    }
+                </script>
+            </div>
+            <!-- /.content-wrapper -->
+            <footer class="main-footer">
+                <div>
+                    <div class="pull-right hidden-xs">
+                        <a href="https://github.com/schemaspy/schemaspy" title="GitHub for SchemaSpy"><i class="fa fa-github-square fa-2x"></i></a>
+                        <a href="http://stackoverflow.com/questions/tagged/schemaspy" title="StackOverflow for SchemaSpy"><i class="fa fa-stack-overflow fa-2x"></i></a>
+                    </div>
+                    <strong>Generated by <a href="http://schemaspy.org/" class="logo-text"><i class="fa fa-database"></i> SchemaSpy 6.2.4</a></strong>
+                </div>
+                <!-- /.container -->
+            </footer>
+        </div>
+        <!-- ./wrapper -->
+
+        <!-- jQuery 2.2.3 -->
+        <script src="bower/admin-lte/plugins/jQuery/jquery-2.2.3.min.js"></script>
+        <script src="bower/admin-lte/plugins/jQueryUI/jquery-ui.min.js"></script>
+        <!-- Bootstrap 3.3.5 -->
+        <script src="bower/admin-lte/bootstrap/js/bootstrap.min.js"></script>
+        <!-- DataTables -->
+        <script src="bower/datatables.net/jquery.dataTables.min.js"></script>
+        <script src="bower/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/dataTables.buttons.min.js"></script>
+        <script src="bower/datatables.net-buttons-bs/js/buttons.bootstrap.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.html5.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.print.min.js"></script>
+        <script src="bower/datatables.net-buttons/buttons.colVis.min.js"></script>
+        <!-- SheetJS -->
+        <script src="bower/js-xlsx/xlsx.full.min.js"></script>
+        <!-- pdfmake -->
+        <script src="bower/pdfmake/pdfmake.min.js"></script>
+        <script src="bower/pdfmake/vfs_fonts.js"></script>
+        <!-- SlimScroll -->
+        <script src="bower/admin-lte/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+        <!-- FastClick -->
+        <script src="bower/admin-lte/plugins/fastclick/fastclick.js"></script>
+        <!-- Salvattore -->
+        <script src="bower/salvattore/salvattore.min.js"></script>
+        <!-- AnchorJS -->
+        <script src="bower/anchor-js/anchor.min.js"></script>
+        <!-- CodeMirror -->
+        <script src="bower/codemirror/codemirror.js"></script>
+        <script src="bower/codemirror/sql.js"></script>
+        <!-- AdminLTE App -->
+        <script src="bower/admin-lte/dist/js/app.min.js"></script>
+        <script src="constraint.js"></script>
+        <script src="schemaSpy.js"></script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/users/default.users.xml b/users/default.users.xml
new file mode 100644
index 0000000000..e82b3003b4
--- /dev/null
+++ b/users/default.users.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><database name="default" schema="users" type="PostgreSQL - 16.4 (Debian 16.4-1.pgdg110+2)">
+   <tables>
+      <table name="flyway_schema_history" remarks="" schema="users" type="TABLE">
+         <column autoUpdated="false" defaultValue="null" digits="0" id="0" name="installed_rank" nullable="false" remarks="" size="10" type="int4" typeCode="4"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="1" name="version" nullable="true" remarks="" size="50" type="varchar" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="2" name="description" nullable="false" remarks="" size="200" type="varchar" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="3" name="type" nullable="false" remarks="" size="20" type="varchar" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="4" name="script" nullable="false" remarks="" size="1000" type="varchar" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="5" name="checksum" nullable="true" remarks="" size="10" type="int4" typeCode="4"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="6" name="installed_by" nullable="false" remarks="" size="100" type="varchar" typeCode="12"/>
+         <column autoUpdated="false" defaultValue="now()" digits="6" id="7" name="installed_on" nullable="false" remarks="" size="29" type="timestamp" typeCode="93"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="8" name="execution_time" nullable="false" remarks="" size="10" type="int4" typeCode="4"/>
+         <column autoUpdated="false" defaultValue="null" digits="0" id="9" name="success" nullable="false" remarks="" size="1" type="bool" typeCode="-7"/>
+         <primaryKey column="installed_rank" sequenceNumberInPK="1"/>
+         <index name="flyway_schema_history_pk" unique="true">
+            <column ascending="true" name="installed_rank"/>
+         </index>
+         <index name="flyway_schema_history_s_idx" unique="false">
+            <column ascending="true" name="success"/>
+         </index>
+      </table>
+   </tables>
+</database>
diff --git a/users/deletionOrder.txt b/users/deletionOrder.txt
new file mode 100644
index 0000000000..114175da07
--- /dev/null
+++ b/users/deletionOrder.txt
@@ -0,0 +1 @@
+flyway_schema_history
diff --git a/schema/nrfc/diagrams/orphans/orphans.dot b/users/diagrams/orphans/orphans.dot
similarity index 51%
rename from schema/nrfc/diagrams/orphans/orphans.dot
rename to users/diagrams/orphans/orphans.dot
index 2dee72825d..48e500d9f8 100644
--- a/schema/nrfc/diagrams/orphans/orphans.dot
+++ b/users/diagrams/orphans/orphans.dot
@@ -1,25 +1,5 @@
 digraph "orphans" {
   graph [    rankdir="RL"    bgcolor="#ffffff"    nodesep="0.18"    ranksep="0.46"    fontname="Helvetica"    fontsize="11"    ration="compress"  ];  node [    fontname="Helvetica"    fontsize="11"    shape="plaintext"  ];  edge [    arrowsize="0.8"  ];
-  "email_log" [
-   label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="4"  BGCOLOR="#f5f5f5"><TABLE BORDER="0" CELLSPACING="0"><TR><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="56" HEIGHT="16"><B>email_log</B></TD><TD ALIGN="RIGHT">[table]</TD></TR></TABLE></TD></TR>
-      <TR><TD PORT="email_log_id" COLSPAN="2" 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="115" HEIGHT="16">email_log_id</TD></TR></TABLE></TD><TD PORT="email_log_id.type" ALIGN="LEFT">serial[10]</TD></TR>
-      <TR><TD PORT="email_id" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_id</TD></TR></TABLE></TD><TD PORT="email_id.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_sent_ind" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_sent_ind</TD></TR></TABLE></TD><TD PORT="email_sent_ind.type" ALIGN="LEFT">varchar[1]</TD></TR>
-      <TR><TD PORT="exception_message" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">exception_message</TD></TR></TABLE></TD><TD PORT="exception_message.type" ALIGN="LEFT">text[2147483647]</TD></TR>
-      <TR><TD PORT="template_name" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">template_name</TD></TR></TABLE></TD><TD PORT="template_name.type" ALIGN="LEFT">varchar[40]</TD></TR>
-      <TR><TD PORT="email_address" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_address</TD></TR></TABLE></TD><TD PORT="email_address.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_subject" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_subject</TD></TR></TABLE></TD><TD PORT="email_subject.type" ALIGN="LEFT">varchar[100]</TD></TR>
-      <TR><TD PORT="email_variables" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">email_variables</TD></TR></TABLE></TD><TD PORT="email_variables.type" ALIGN="LEFT">jsonb[2147483647]</TD></TR>
-      <TR><TD PORT="create_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">create_timestamp</TD></TR></TABLE></TD><TD PORT="create_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD PORT="update_timestamp" COLSPAN="2" ALIGN="LEFT"><TABLE BORDER="0" CELLSPACING="0" ALIGN="LEFT"><TR ALIGN="LEFT"><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="15" HEIGHT="16"></TD><TD ALIGN="LEFT" FIXEDSIZE="TRUE" WIDTH="115" HEIGHT="16">update_timestamp</TD></TR></TABLE></TD><TD PORT="update_timestamp.type" ALIGN="LEFT">timestamp[29,6]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#ffffff">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">  </TD><TD ALIGN="RIGHT" BGCOLOR="#ffffff">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="tables/email_log.html"
-    target="_top"
-    tooltip="email_log"
-  ];
   "flyway_schema_history" [
    label=<
     <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
diff --git a/users/diagrams/orphans/orphans.png b/users/diagrams/orphans/orphans.png
new file mode 100644
index 0000000000..ad5f6458d0
Binary files /dev/null and b/users/diagrams/orphans/orphans.png differ
diff --git a/schema/nrfc/diagrams/tables/flyway_schema_history.1degree.dot b/users/diagrams/tables/flyway_schema_history.1degree.dot
similarity index 100%
rename from schema/nrfc/diagrams/tables/flyway_schema_history.1degree.dot
rename to users/diagrams/tables/flyway_schema_history.1degree.dot
diff --git a/schema/nrfc/diagrams/tables/flyway_schema_history.1degree.png b/users/diagrams/tables/flyway_schema_history.1degree.png
similarity index 100%
rename from schema/nrfc/diagrams/tables/flyway_schema_history.1degree.png
rename to users/diagrams/tables/flyway_schema_history.1degree.png
diff --git a/schema/nrfc/favicon.png b/users/favicon.png
similarity index 100%
rename from schema/nrfc/favicon.png
rename to users/favicon.png
diff --git a/schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.eot b/users/fonts/indieflower/indie-flower-v8-latin-regular.eot
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.eot
rename to users/fonts/indieflower/indie-flower-v8-latin-regular.eot
diff --git a/schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.svg b/users/fonts/indieflower/indie-flower-v8-latin-regular.svg
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.svg
rename to users/fonts/indieflower/indie-flower-v8-latin-regular.svg
diff --git a/schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.ttf b/users/fonts/indieflower/indie-flower-v8-latin-regular.ttf
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.ttf
rename to users/fonts/indieflower/indie-flower-v8-latin-regular.ttf
diff --git a/schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.woff b/users/fonts/indieflower/indie-flower-v8-latin-regular.woff
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.woff
rename to users/fonts/indieflower/indie-flower-v8-latin-regular.woff
diff --git a/schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.woff2 b/users/fonts/indieflower/indie-flower-v8-latin-regular.woff2
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower-v8-latin-regular.woff2
rename to users/fonts/indieflower/indie-flower-v8-latin-regular.woff2
diff --git a/schema/nrfc/fonts/indieflower/indie-flower.css b/users/fonts/indieflower/indie-flower.css
similarity index 100%
rename from schema/nrfc/fonts/indieflower/indie-flower.css
rename to users/fonts/indieflower/indie-flower.css
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-300italic.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-600italic.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-700.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.eot
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.svg
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.ttf
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2 b/users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
rename to users/fonts/source-sans-pro/source-sans-pro-v10-latin-regular.woff2
diff --git a/schema/nrfc/fonts/source-sans-pro/source-sans-pro.css b/users/fonts/source-sans-pro/source-sans-pro.css
similarity index 100%
rename from schema/nrfc/fonts/source-sans-pro/source-sans-pro.css
rename to users/fonts/source-sans-pro/source-sans-pro.css
diff --git a/schema/nrfc/images/foreignKey.png b/users/images/foreignKey.png
similarity index 100%
rename from schema/nrfc/images/foreignKey.png
rename to users/images/foreignKey.png
diff --git a/schema/nrfc/images/foreignKeys.png b/users/images/foreignKeys.png
similarity index 100%
rename from schema/nrfc/images/foreignKeys.png
rename to users/images/foreignKeys.png
diff --git a/schema/nrfc/images/primaryKey.png b/users/images/primaryKey.png
similarity index 100%
rename from schema/nrfc/images/primaryKey.png
rename to users/images/primaryKey.png
diff --git a/schema/nrfc/images/primaryKeys.png b/users/images/primaryKeys.png
similarity index 100%
rename from schema/nrfc/images/primaryKeys.png
rename to users/images/primaryKeys.png
diff --git a/schema/nrfc/index.html b/users/index.html
similarity index 52%
rename from schema/nrfc/index.html
rename to users/index.html
index dfe48cdb07..cf2a350046 100644
--- a/schema/nrfc/index.html
+++ b/users/index.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
+        <title>default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
@@ -46,7 +46,7 @@
                 <nav class="navbar navbar-static-top">
                     <div class="container">
                         <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
                             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
                         </div>
 
@@ -77,12 +77,12 @@ <h1>Tables</h1><br />
                     <div class="row">
                         <div class="col-md-12">
                             <div class="callout callout-info">
-                                <h4>SchemaSpy Analysis of default.nrfc</h4>
-                                <p>Generated on Wed Nov 13 20:40 GMT 2024</p>
+                                <h4>SchemaSpy Analysis of default.users</h4>
+                                <p>Generated on Sat Nov 16 11:04 GMT 2024</p>
                             </div>
                         </div>
                     </div>
-                    <a href="default.nrfc.xml" title="XML Representation">XML Representation</a><br />
+                    <a href="default.users.xml" title="XML Representation">XML Representation</a><br />
                     <a href="insertionOrder.txt" title="Useful for loading data into a database">Insertion Order</a>
                     <a href="deletionOrder.txt" title="Useful for purging data from a database">Deletion Order</a>
                 </section>
@@ -94,7 +94,7 @@ <h4>SchemaSpy Analysis of default.nrfc</h4>
                                 <span class="info-box-icon bg-aqua"><i class="fa fa-table"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">TABLES</span>
-                                    <span class="info-box-number">17</span>
+                                    <span class="info-box-number">1</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -118,7 +118,7 @@ <h4>SchemaSpy Analysis of default.nrfc</h4>
                                 <span class="info-box-icon bg-green"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">COLUMNS</span>
-                                    <span class="info-box-number">161</span>
+                                    <span class="info-box-number">10</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -130,7 +130,7 @@ <h4>SchemaSpy Analysis of default.nrfc</h4>
                                 <span class="info-box-icon bg-yellow"><i class="ion ion-key"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">Constraints</span>
-                                    <span class="info-box-number">17</span>
+                                    <span class="info-box-number">0</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -142,7 +142,7 @@ <h4>SchemaSpy Analysis of default.nrfc</h4>
                                 <span class="info-box-icon bg-red-active"><i class="fa fa-question" aria-hidden="true"></i></span>
                                 <div class="info-box-content">
                                     <span class="info-box-text">Anomalies</span>
-                                    <span class="info-box-number">2</span>
+                                    <span class="info-box-number">0</span>
                                 </div>
                                 <!-- /.info-box-content -->
                             </div>
@@ -196,51 +196,6 @@ <h3 class="box-title">Tables</h3>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_contact.html">submission_contact</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">10</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 details of a contacts for each client&rsquo;s location.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_status_code.html">submission_status_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A code indicating the status of a client creation submission request. Examples of possible statuses include Approved, Rejected, and others.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/client_type_code.html">client_type_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <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_matching_detail.html">submission_matching_detail</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">-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>
-                                    </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" 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">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>
-                                    </tr>
                                     <tr class="tbl even" valign="top">
                                         <td class="detail"><a href="tables/flyway_schema_history.html">flyway_schema_history</a></td>
                                         <td class="detail" align="right">0</td>
@@ -250,105 +205,6 @@ <h3 class="box-title">Tables</h3>
                                         <td class="detail" align="right">Table</td>
                                         <td class="comment detail" style="display: table-cell;"></td>
                                     </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission.html">submission</a></td>
-                                        <td class="detail" align="right">4</td>
-                                        <td class="detail" align="right">2</td>
-                                        <td class="detail" align="right">7</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A submission request to create a client.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_location.html">submission_location</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">4</td>
-                                        <td class="detail" align="right">15</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 details of a client&rsquo;s location.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/province_code.html">province_code</a></td>
-                                        <td class="detail" align="right">4</td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">10</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A list of provinces, states, departments or territories, serving as a reference for province-specific data.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/email_log.html">email_log</a></td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">10</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>Stores email log information</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_type_code.html">submission_type_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A code indicating the type of a submission request. Examples of possible type are TBD.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/district_code.html">district_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</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>A list of Natural Resource Districts.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/business_type_code.html">business_type_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A code indicating the business type of a client. It could be either Registered Business and Unregistered Business.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/submission_detail.html">submission_detail</a></td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">7</td>
-                                        <td class="detail" align="right">21</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 details of a submission request to create a client.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/identification_type_code.html">identification_type_code</a></td>
-                                        <td class="detail" align="right">1</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;"></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/contact_type_code.html">contact_type_code</a></td>
-                                        <td class="detail" align="right">1</td>
-                                        <td class="detail" align="right">0</td>
-                                        <td class="detail" align="right">8</td>
-                                        <td class="detail" align="right">-1</td>
-                                        <td class="detail" align="right">Table</td>
-                                        <td class="comment detail" style="display: table-cell;"><p>A code indicating the role of a contact of a client.</p></td>
-                                    </tr>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="tables/country_code.html">country_code</a></td>
-                                        <td class="detail" align="right">3</td>
-                                        <td class="detail" align="right">0</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>A list of countries, serving as a reference for country-specific data.</p></td>
-                                    </tr>
                             </table>
                         </div>
                     </div><!-- /.box-body -->
diff --git a/schema/nrfc/info-html.txt b/users/info-html.txt
similarity index 80%
rename from schema/nrfc/info-html.txt
rename to users/info-html.txt
index 86121c1792..eaaaed6cef 100644
--- a/schema/nrfc/info-html.txt
+++ b/users/info-html.txt
@@ -1,4 +1,4 @@
-date=2024-11-13 20:40:34+0000
+date=2024-11-16 11:04:49+0000
 os=Linux 6.8.0-1017-azure
 schemaspy-version=6.2.4
 schemaspy-build=6.2.4.41 2023-07-21 11:15:12
diff --git a/users/insertionOrder.txt b/users/insertionOrder.txt
new file mode 100644
index 0000000000..114175da07
--- /dev/null
+++ b/users/insertionOrder.txt
@@ -0,0 +1 @@
+flyway_schema_history
diff --git a/schema/nrfc/main.js b/users/main.js
similarity index 100%
rename from schema/nrfc/main.js
rename to users/main.js
diff --git a/schema/nrfc/orphans.html b/users/orphans.html
similarity index 97%
rename from schema/nrfc/orphans.html
rename to users/orphans.html
index be501f7763..82f7a95b46 100644
--- a/schema/nrfc/orphans.html
+++ b/users/orphans.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
+        <title>default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
@@ -46,7 +46,7 @@
                 <nav class="navbar navbar-static-top">
                     <div class="container">
                         <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
                             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
                         </div>
 
@@ -87,8 +87,7 @@ <h3 class="box-title">Orphan Tables</h3>
                                 <div class="item">
 <img id="orphans" src="diagrams/orphans/orphans.png" usemap="#orphans" style="max-width:100%;" border="0" align="top">
 <map id="orphans" name="orphans">
-<area shape="rect" id="node1" href="tables/email_log.html" target="_top" title="email_log" alt="" coords="12,385,357,748">
-<area shape="rect" id="node2" href="tables/flyway_schema_history.html" target="_top" title="flyway_schema_history" alt="" coords="5,5,364,368">
+<area shape="rect" id="node1" href="tables/flyway_schema_history.html" target="_top" title="flyway_schema_history" alt="" coords="5,5,364,368">
 </map>
                                 </div>
                             </div>
diff --git a/schema/index.html b/users/relationships.html
similarity index 68%
rename from schema/index.html
rename to users/relationships.html
index ec65431ea8..37734a1762 100644
--- a/schema/index.html
+++ b/users/relationships.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default</title>
+        <title>default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
@@ -42,59 +42,47 @@
     <!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
     <body class="hold-transition skin-blue layout-top-nav">
         <div class="wrapper">
+            <header class="main-header">
+                <nav class="navbar navbar-static-top">
+                    <div class="container">
+                        <div class="navbar-header">
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
+                            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
+                        </div>
+
+                        <!-- Collect the nav links, forms, and other content for toggling -->
+                        <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
+                            <ul class="nav navbar-nav">
+                                <li><a href="index.html">Tables <span class="sr-only">(current)</span></a></li>
+                                <li><a href="columns.html" title="All of the columns in the schema">Columns</a></li>
+                                <li><a href="constraints.html" title="Useful for diagnosing error messages that just give constraint name or number">Constraints</a></li>
+                                <li><a href="relationships.html" title="Diagram of table relationships">Relationships</a></li>
+                                <li><a href="orphans.html" title="View of tables with neither parents nor children">Orphan&nbsp;Tables</a></li>
+                                <li><a href="anomalies.html" title="Things that might not be quite right">Anomalies</a></li>
+                                <li><a href="routines.html" title="Procedures and functions">Routines</a></li>
+                            </ul>
+                        </div>
+                        <!-- /.navbar-collapse -->
+                        <!-- Navbar Right Menu -->
+                    </div>
+                    <!-- /.container-fluid -->
+                </nav>
+            </header>
             <!-- Main content -->
             <!-- Full Width Column -->
             <div class="content-wrapper">
                 <!-- Content Header (Page header) -->
                 <section class="content-header">
-                    <div class="callout callout-info">
-                        <h4>SchemaSpy Analysis of default</h4>
-                        <p>Generated on Wed Nov 13 20:40 GMT 2024</p>
-                    </div>
+                    <h1>All Relationships</h1>
                 </section>
                 <!-- Main content -->
                 <section class="content">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <h3 class="box-title">Database Properties</h3>
-                            <span class="label label-primary pull-right"><i class="fa fa-cog fa-2x"></i></span>
-                        </div><!-- /.box-header -->
-                        <div class="box-body">
-                            <p>Database Type: PostgreSQL - 16.4 (Debian 16.4-1.pgdg110+2)</p>
-                        </div><!-- /.box-body -->
-                    </div>
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <h3 class="box-title">1 Schemas</h3>
-                            <span class="label label-primary pull-right"><i class="fa fa-database fa-2x"></i></span>
-                        </div><!-- /.box-header -->
-                        <div class="box-body">
-                            <table
-                                    id="database_objects"
-                                    class="table table-bordered table-striped dataTable"
-                                    role="grid"
-                                    data-paging="true"
-                                    data-page-length="50"
-                                    data-length-change="false">
-                                <thead>
-                                    <tr>
-                                        <th valign="bottom">Schema</th>
-                                        <th valign="bottom">Comments</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr class="tbl even" valign="top">
-                                        <td class="detail"><a href="nrfc/index.html">nrfc</a></td>
-                                        <td class="comment detail" style="display: table-cell;"></td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <!-- /.box-body -->
+                    <div class="alert alert-danger alert-dismissible">
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                        <h4><i class="icon fa fa-ban"></i> Missed Relationships!</h4>
+                        <p>No relationships were detected in the schema.</p>
                     </div>
                 </section>
-                <!-- /.content -->
-
             </div>
             <!-- /.content-wrapper -->
             <footer class="main-footer">
@@ -141,7 +129,7 @@ <h3 class="box-title">1 Schemas</h3>
         <script src="bower/codemirror/sql.js"></script>
         <!-- AdminLTE App -->
         <script src="bower/admin-lte/dist/js/app.min.js"></script>
-        <script src=""></script>
+        <script src="relationships.js"></script>
         <script src="schemaSpy.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/schema/relationships.js b/users/relationships.js
similarity index 100%
rename from schema/relationships.js
rename to users/relationships.js
diff --git a/schema/nrfc/routines.html b/users/routines.html
similarity index 99%
rename from schema/nrfc/routines.html
rename to users/routines.html
index 1670101e90..fb680f330d 100644
--- a/schema/nrfc/routines.html
+++ b/users/routines.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>default.nrfc</title>
+        <title>default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="favicon.png">
@@ -46,7 +46,7 @@
                 <nav class="navbar navbar-static-top">
                     <div class="container">
                         <div class="navbar-header">
-                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
+                            <a href="../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
                             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
                         </div>
 
diff --git a/schema/routines.js b/users/routines.js
similarity index 100%
rename from schema/routines.js
rename to users/routines.js
diff --git a/schema/routines/routine.js b/users/routines/routine.js
similarity index 100%
rename from schema/routines/routine.js
rename to users/routines/routine.js
diff --git a/schema/schemaSpy.css b/users/schemaSpy.css
similarity index 100%
rename from schema/schemaSpy.css
rename to users/schemaSpy.css
diff --git a/schema/schemaSpy.js b/users/schemaSpy.js
similarity index 100%
rename from schema/schemaSpy.js
rename to users/schemaSpy.js
diff --git a/schema/nrfc/tables/flyway_schema_history.html b/users/tables/flyway_schema_history.html
similarity index 99%
rename from schema/nrfc/tables/flyway_schema_history.html
rename to users/tables/flyway_schema_history.html
index 8f831f9e23..6b63a89517 100644
--- a/schema/nrfc/tables/flyway_schema_history.html
+++ b/users/tables/flyway_schema_history.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>flyway_schema_history - default.nrfc</title>
+        <title>flyway_schema_history - default.users</title>
         <!-- Tell the browser to be responsive to screen width -->
         <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
         <link rel="icon" type="image/png" sizes="16x16" href="../favicon.png">
@@ -46,7 +46,7 @@
                 <nav class="navbar navbar-static-top">
                     <div class="container">
                         <div class="navbar-header">
-                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.nrfc</span>
+                            <a href="../../index.html" class="navbar-brand"><b>default</b></a><span class="navbar-brand" style="padding-left: 0">.users</span>
                             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"><i class="fa fa-bars"></i></button>
                         </div>
 
diff --git a/schema/tables/table.js b/users/tables/table.js
similarity index 100%
rename from schema/tables/table.js
rename to users/tables/table.js