From 36647fca8084110f4471635024121f912b003bb7 Mon Sep 17 00:00:00 2001
From: aB0t <robot@vdm.io>
Date: Sun, 13 Oct 2024 22:54:01 +0200
Subject: [PATCH] Release of v5.0.4-alpha3

Fix Save failed issue in dynamicGet. #1148. Move all [TEXT, EDITOR, TEXTAREA] fields from [NOT NULL] to [NULL]. Add the DateHelper class and improve the date methods. Add simple SessionHelper class.
---
 CHANGELOG.md                                  |  16 +-
 ComponentbuilderInstallerScript.php           |   2 +-
 README.md                                     |  10 +-
 admin/README.txt                              |  10 +-
 admin/forms/component_admin_views.xml         |   1 -
 admin/forms/component_config.xml              |   1 -
 admin/forms/component_custom_admin_menus.xml  |   1 -
 admin/forms/component_custom_admin_views.xml  |   1 -
 admin/forms/component_dashboard.xml           |   2 -
 admin/forms/component_files_folders.xml       |   1 -
 admin/forms/component_modules.xml             |   1 -
 admin/forms/component_mysql_tweaks.xml        |   2 -
 admin/forms/component_placeholders.xml        |   1 -
 admin/forms/component_plugins.xml             |   1 -
 admin/forms/component_router.xml              |   1 -
 admin/forms/component_site_views.xml          |   1 -
 admin/forms/component_updates.xml             |   2 -
 admin/forms/fieldtype.xml                     |   1 -
 admin/forms/joomla_module_updates.xml         |   1 -
 admin/forms/joomla_plugin_updates.xml         |   1 -
 admin/forms/server.xml                        |   1 -
 .../en-GB/en-GB.com_componentbuilder.ini      |   4 +-
 admin/sql/install.mysql.utf8.sql              | 626 +++++++++---------
 admin/src/Helper/ComponentbuilderHelper.php   | 289 ++++----
 .../src/Model/Admin_fields_relationsModel.php |  21 +-
 admin/src/Model/Admin_viewModel.php           |  23 +-
 admin/src/Model/AjaxModel.php                 |   9 +-
 admin/src/Model/Class_extendsModel.php        |  21 +-
 admin/src/Model/Class_methodModel.php         |  23 +-
 admin/src/Model/Class_propertyModel.php       |  23 +-
 admin/src/Model/Component_dashboardModel.php  |  21 +-
 admin/src/Model/Component_routerModel.php     |  21 +-
 admin/src/Model/Custom_admin_viewModel.php    |  21 +-
 admin/src/Model/Custom_codeModel.php          |  23 +-
 admin/src/Model/Dynamic_getModel.php          |  23 +-
 admin/src/Model/FieldModel.php                |  23 +-
 admin/src/Model/FieldtypeModel.php            |  23 +-
 admin/src/Model/Help_documentModel.php        |   2 +-
 admin/src/Model/Joomla_componentModel.php     |  23 +-
 admin/src/Model/Joomla_moduleModel.php        |  21 +-
 admin/src/Model/Joomla_pluginModel.php        |  21 +-
 admin/src/Model/Language_translationModel.php |  21 +-
 admin/src/Model/LayoutModel.php               |  21 +-
 admin/src/Model/LibraryModel.php              |  23 +-
 admin/src/Model/PlaceholderModel.php          |  21 +-
 admin/src/Model/PowerModel.php                |  21 +-
 admin/src/Model/ServerModel.php               |   2 +-
 admin/src/Model/Site_viewModel.php            |  21 +-
 admin/src/Model/TemplateModel.php             |  21 +-
 admin/src/Model/Validation_ruleModel.php      |  21 +-
 admin/src/View/Field/HtmlView.php             |   6 +-
 admin/tmpl/joomla_components/default_body.php |   6 +-
 componentbuilder.xml                          |   6 +-
 componentbuilder_update_server.xml            |   6 +-
 .../Compiler/Helper/Interpretation.php        |   2 +-
 .../src/Componentbuilder/File/Manager.php     |   1 +
 .../Spreadsheet/ChunkReadFilter.php           |  72 ++
 .../Componentbuilder/Spreadsheet/Exporter.php |   6 +-
 .../Componentbuilder/Spreadsheet/Header.php   |   4 +-
 .../Componentbuilder/Spreadsheet/Importer.php |   2 +-
 .../VDM.Joomla/src/Componentbuilder/Table.php | 602 ++++++++---------
 .../VDM.Joomla/src/Utilities/DateHelper.php   | 294 ++++++++
 .../src/Utilities/SessionHelper.php           |  89 +++
 63 files changed, 1553 insertions(+), 1034 deletions(-)
 create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/ChunkReadFilter.php
 create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php
 create mode 100644 libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 211b7ef02..8f4b204c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,20 @@
-# v5.0.4-alpha2
+# v5.0.4-alpha3
 
+- Fix Save failed issue in dynamicGet. #1148
+- Move all [TEXT, EDITOR, TEXTAREA] fields from [NOT NULL] to [NULL]
+- Add the DateHelper class and improve the date methods.
+- Add simple SessionHelper class.
+
+# v5.0.4-alpha
+
+- Add [AllowDynamicProperties] in the base view class for J5
+- Move the _prepareDocument  above the display call in the base view class
 - Remove all backward compatibility issues, so JCB will not need the [Backward Compatibility] plugin to run.
 - Added new import powers for custom import of spreadsheets.
 - Move the setDocument and _prepareDocument above the display in the site view and custom admin view.
 - Update the trashhelper layout to work in Joomla 5.
 - Add AllowDynamicProperties (Joomla 4+5) to view class to allow Custom Dynamic Get methods to work without issues.
 
-# v5.0.4-alpha
-
-- Add [AllowDynamicProperties] in the base view class for J5
-- Move the _prepareDocument  above the display call in the base view class
-
 # v5.0.3
 
 - Add [push] option to powers area.
diff --git a/ComponentbuilderInstallerScript.php b/ComponentbuilderInstallerScript.php
index 23b9c6860..9b98dede7 100644
--- a/ComponentbuilderInstallerScript.php
+++ b/ComponentbuilderInstallerScript.php
@@ -3270,7 +3270,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.0.4-alpha2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.0.4-alpha3 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();
diff --git a/README.md b/README.md
index f9f51cf41..5011ef30c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.4-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.4-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 7th October, 2024
-+ *Version*: 5.0.4-alpha2
++ *Last Build*: 13th October, 2024
++ *Version*: 5.0.4-alpha3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **868100**
++ *Line count*: **871753**
 + *Field count*: **2104**
-+ *File count*: **5997**
++ *File count*: **6028**
 + *Folder count*: **633**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index f9f51cf41..5011ef30c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.4-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.0.4-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 7th October, 2024
-+ *Version*: 5.0.4-alpha2
++ *Last Build*: 13th October, 2024
++ *Version*: 5.0.4-alpha3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **868100**
++ *Line count*: **871753**
 + *Field count*: **2104**
-+ *File count*: **5997**
++ *File count*: **6028**
 + *Folder count*: **633**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).
diff --git a/admin/forms/component_admin_views.xml b/admin/forms/component_admin_views.xml
index 1c19e2d8a..80ff5d3c5 100644
--- a/admin/forms/component_admin_views.xml
+++ b/admin/forms/component_admin_views.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_config.xml b/admin/forms/component_config.xml
index 60195ea99..f1313108c 100644
--- a/admin/forms/component_config.xml
+++ b/admin/forms/component_config.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_custom_admin_menus.xml b/admin/forms/component_custom_admin_menus.xml
index 0fed197fc..4af8d0fba 100644
--- a/admin/forms/component_custom_admin_menus.xml
+++ b/admin/forms/component_custom_admin_menus.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_custom_admin_views.xml b/admin/forms/component_custom_admin_views.xml
index b97701916..81f307496 100644
--- a/admin/forms/component_custom_admin_views.xml
+++ b/admin/forms/component_custom_admin_views.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_dashboard.xml b/admin/forms/component_dashboard.xml
index d0eb7fc53..f12c764d0 100644
--- a/admin/forms/component_dashboard.xml
+++ b/admin/forms/component_dashboard.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -174,7 +173,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL"
 					rows="20"
 					cols="30"
-					default=""
 					class="text_area tab_html"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT"
diff --git a/admin/forms/component_files_folders.xml b/admin/forms/component_files_folders.xml
index 0c2bb449e..8718926b5 100644
--- a/admin/forms/component_files_folders.xml
+++ b/admin/forms/component_files_folders.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_modules.xml b/admin/forms/component_modules.xml
index 5802d59ee..e28998faa 100644
--- a/admin/forms/component_modules.xml
+++ b/admin/forms/component_modules.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_mysql_tweaks.xml b/admin/forms/component_mysql_tweaks.xml
index 598afe14f..eda226626 100644
--- a/admin/forms/component_mysql_tweaks.xml
+++ b/admin/forms/component_mysql_tweaks.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -187,7 +186,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_LABEL"
 					rows="20"
 					cols="40"
-					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_DESCRIPTION"
 					class="text_area ids_selection"
 					filter="raw"
diff --git a/admin/forms/component_placeholders.xml b/admin/forms/component_placeholders.xml
index 5e2170859..564a58635 100644
--- a/admin/forms/component_placeholders.xml
+++ b/admin/forms/component_placeholders.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_plugins.xml b/admin/forms/component_plugins.xml
index 8c6b09ebd..5f3e62691 100644
--- a/admin/forms/component_plugins.xml
+++ b/admin/forms/component_plugins.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_router.xml b/admin/forms/component_router.xml
index c9a25e2ce..ee6865ff4 100644
--- a/admin/forms/component_router.xml
+++ b/admin/forms/component_router.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_ROUTER_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_site_views.xml b/admin/forms/component_site_views.xml
index 48dd71173..69f419793 100644
--- a/admin/forms/component_site_views.xml
+++ b/admin/forms/component_site_views.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
diff --git a/admin/forms/component_updates.xml b/admin/forms/component_updates.xml
index 4260026fe..c94bade57 100644
--- a/admin/forms/component_updates.xml
+++ b/admin/forms/component_updates.xml
@@ -104,7 +104,6 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
-			layout="joomla.form.field.list-fancy-select"
 			multiple="false"
 			required="true"
 			readonly="true"
@@ -159,7 +158,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_LABEL"
 					rows="30"
 					cols="15"
-					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_DESCRIPTION"
 					class="text_area mysql_update"
 					filter="raw"
diff --git a/admin/forms/fieldtype.xml b/admin/forms/fieldtype.xml
index 16dc739ca..3ff880d1b 100644
--- a/admin/forms/fieldtype.xml
+++ b/admin/forms/fieldtype.xml
@@ -332,7 +332,6 @@
 					label="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL"
 					rows="2"
 					cols="15"
-					default=""
 					description="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_DESCRIPTION"
 					message="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE"
 					class="text_area span12"
diff --git a/admin/forms/joomla_module_updates.xml b/admin/forms/joomla_module_updates.xml
index 132512a69..42f311247 100644
--- a/admin/forms/joomla_module_updates.xml
+++ b/admin/forms/joomla_module_updates.xml
@@ -143,7 +143,6 @@
 					label="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_MYSQL_LABEL"
 					rows="30"
 					cols="15"
-					default=""
 					description="COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATES_MYSQL_DESCRIPTION"
 					class="text_area mysql_update"
 					filter="raw"
diff --git a/admin/forms/joomla_plugin_updates.xml b/admin/forms/joomla_plugin_updates.xml
index 4d3fc1477..61b65d420 100644
--- a/admin/forms/joomla_plugin_updates.xml
+++ b/admin/forms/joomla_plugin_updates.xml
@@ -143,7 +143,6 @@
 					label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_LABEL"
 					rows="30"
 					cols="15"
-					default=""
 					description="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATES_MYSQL_DESCRIPTION"
 					class="text_area mysql_update"
 					filter="raw"
diff --git a/admin/forms/server.xml b/admin/forms/server.xml
index 75ad1899b..5979853f4 100644
--- a/admin/forms/server.xml
+++ b/admin/forms/server.xml
@@ -166,7 +166,6 @@
 			label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL"
 			rows="15"
 			cols="5"
-			default=""
 			description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION"
 			class="input-xxlarge span12"
 			hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index f45dbe804..ef64933a9 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -4171,9 +4171,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION="The end hash target
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT="autogenerated md5 hash"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL="End Hash Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_MESSAGE="Error! Please add some text here."
-COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The start hash target to help insert the code at the correct place, if the line position change. This hash is the md5 of a few lines above the custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The end hash target to help insert the code until the correct place, if the line position change. This hash is the md5 of a few lines below the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT="autogenerated md5 hash"
-COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="Start Hash Target"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="End Hash Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION="Hash (automation)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HTML="HTML"
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index d7720505b..a51a33df1 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -30,69 +30,69 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_update_server` TINYINT(1) NOT NULL DEFAULT 0,
-	`addcontributors` TEXT NOT NULL,
+	`addcontributors` TEXT NULL,
 	`addfootable` TINYINT(1) NOT NULL DEFAULT 0,
 	`addreadme` TINYINT(1) NOT NULL DEFAULT 0,
 	`adduikit` TINYINT(1) NOT NULL DEFAULT 0,
 	`assets_table_fix` TINYINT(1) NOT NULL DEFAULT 3,
-	`author` VARCHAR(255) NOT NULL DEFAULT '',
-	`backup_folder_path` VARCHAR(255) NOT NULL DEFAULT '',
+	`author` VARCHAR(255) NULL DEFAULT '',
+	`backup_folder_path` VARCHAR(255) NULL DEFAULT '',
 	`bom` CHAR(64) NOT NULL DEFAULT '',
 	`buildcomp` TINYINT(1) NOT NULL DEFAULT 0,
-	`buildcompsql` MEDIUMTEXT NOT NULL,
-	`companyname` CHAR(64) NOT NULL DEFAULT '',
-	`component_version` CHAR(64) NOT NULL DEFAULT '',
-	`copyright` VARCHAR(255) NOT NULL DEFAULT '',
+	`buildcompsql` MEDIUMTEXT NULL,
+	`companyname` CHAR(64) NULL DEFAULT '',
+	`component_version` CHAR(64) NULL DEFAULT '',
+	`copyright` VARCHAR(255) NULL DEFAULT '',
 	`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`creatuserhelper` TINYINT(1) NOT NULL DEFAULT 0,
-	`crowdin_account_api_key` TEXT NOT NULL,
-	`crowdin_project_api_key` TEXT NOT NULL,
-	`crowdin_project_identifier` VARCHAR(255) NOT NULL DEFAULT '',
-	`crowdin_username` TEXT NOT NULL,
-	`css_admin` TEXT NOT NULL,
-	`css_site` TEXT NOT NULL,
+	`crowdin_account_api_key` TEXT NULL,
+	`crowdin_project_api_key` TEXT NULL,
+	`crowdin_project_identifier` VARCHAR(255) NULL DEFAULT '',
+	`crowdin_username` TEXT NULL,
+	`css_admin` TEXT NULL,
+	`css_site` TEXT NULL,
 	`dashboard` VARCHAR(64) NOT NULL DEFAULT '',
 	`dashboard_type` TINYINT(1) NOT NULL DEFAULT 1,
 	`debug_linenr` TINYINT(1) NOT NULL DEFAULT 0,
 	`description` TEXT NULL,
-	`email` VARCHAR(255) NOT NULL DEFAULT '',
+	`email` VARCHAR(255) NULL DEFAULT '',
 	`emptycontributors` TINYINT(1) NOT NULL DEFAULT 0,
 	`export_buy_link` VARCHAR(255) NOT NULL DEFAULT '',
-	`export_key` TEXT NOT NULL,
-	`git_folder_path` VARCHAR(255) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`export_key` TEXT NULL,
+	`git_folder_path` VARCHAR(255) NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`image` VARCHAR(255) NOT NULL DEFAULT '',
-	`javascript` TEXT NOT NULL,
-	`jcb_powers_path` VARCHAR(255) NOT NULL DEFAULT '',
+	`javascript` TEXT NULL,
+	`jcb_powers_path` VARCHAR(255) NULL DEFAULT '',
 	`joomla_source_link` VARCHAR(255) NOT NULL DEFAULT '',
-	`license` VARCHAR(255) NOT NULL DEFAULT '',
-	`menu_prefix` VARCHAR(100) NOT NULL DEFAULT '',
+	`license` VARCHAR(255) NULL DEFAULT '',
+	`menu_prefix` VARCHAR(100) NULL DEFAULT '',
 	`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`mvc_versiondate` TINYINT(1) NOT NULL DEFAULT 0,
-	`name` CHAR(64) NOT NULL DEFAULT '',
-	`name_code` VARCHAR(255) NOT NULL DEFAULT '',
-	`namespace_prefix` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` CHAR(64) NULL DEFAULT '',
+	`name_code` VARCHAR(255) NULL DEFAULT '',
+	`namespace_prefix` VARCHAR(255) NULL DEFAULT '',
 	`number` INT(11) NOT NULL DEFAULT 0,
-	`php_admin_event` MEDIUMTEXT NOT NULL,
-	`php_helper_admin` MEDIUMTEXT NOT NULL,
-	`php_helper_both` MEDIUMTEXT NOT NULL,
-	`php_helper_site` MEDIUMTEXT NOT NULL,
-	`php_method_install` MEDIUMTEXT NOT NULL,
-	`php_method_uninstall` MEDIUMTEXT NOT NULL,
-	`php_postflight_install` MEDIUMTEXT NOT NULL,
-	`php_postflight_update` MEDIUMTEXT NOT NULL,
-	`php_preflight_install` MEDIUMTEXT NOT NULL,
-	`php_preflight_update` MEDIUMTEXT NOT NULL,
-	`php_site_event` MEDIUMTEXT NOT NULL,
+	`php_admin_event` MEDIUMTEXT NULL,
+	`php_helper_admin` MEDIUMTEXT NULL,
+	`php_helper_both` MEDIUMTEXT NULL,
+	`php_helper_site` MEDIUMTEXT NULL,
+	`php_method_install` MEDIUMTEXT NULL,
+	`php_method_uninstall` MEDIUMTEXT NULL,
+	`php_postflight_install` MEDIUMTEXT NULL,
+	`php_postflight_update` MEDIUMTEXT NULL,
+	`php_preflight_install` MEDIUMTEXT NULL,
+	`php_preflight_update` MEDIUMTEXT NULL,
+	`php_site_event` MEDIUMTEXT NULL,
 	`preferred_joomla_version` INT(11) NOT NULL DEFAULT 3,
-	`readme` TEXT NOT NULL,
+	`readme` TEXT NULL,
 	`remove_line_breaks` TINYINT(1) NOT NULL DEFAULT 1,
 	`sales_server` INT(11) NOT NULL DEFAULT 0,
-	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
-	`sql` MEDIUMTEXT NOT NULL,
-	`sql_uninstall` MEDIUMTEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`toignore` TEXT NOT NULL,
+	`short_description` VARCHAR(255) NULL DEFAULT '',
+	`sql` MEDIUMTEXT NULL,
+	`sql_uninstall` MEDIUMTEXT NULL,
+	`system_name` VARCHAR(255) NULL DEFAULT '',
+	`toignore` TEXT NULL,
 	`translation_tool` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server` INT(11) NOT NULL DEFAULT 0,
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
@@ -178,30 +178,30 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` (
 	`add_sql_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_update_server` TINYINT(1) NOT NULL DEFAULT 0,
 	`addreadme` TINYINT(1) NOT NULL DEFAULT 0,
-	`class_helper_code` MEDIUMTEXT NOT NULL,
-	`class_helper_header` TEXT NOT NULL,
-	`custom_get` TEXT NOT NULL,
-	`default` MEDIUMTEXT NOT NULL,
+	`class_helper_code` MEDIUMTEXT NULL,
+	`class_helper_header` TEXT NULL,
+	`custom_get` TEXT NULL,
+	`default` MEDIUMTEXT NULL,
 	`description` TEXT NULL,
 	`fields` TEXT NOT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`libraries` TEXT NOT NULL,
-	`mod_code` TEXT NOT NULL,
-	`module_version` CHAR(64) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_method_uninstall` MEDIUMTEXT NOT NULL,
-	`php_postflight_install` MEDIUMTEXT NOT NULL,
-	`php_postflight_update` MEDIUMTEXT NOT NULL,
-	`php_preflight_install` MEDIUMTEXT NOT NULL,
-	`php_preflight_uninstall` MEDIUMTEXT NOT NULL,
-	`php_preflight_update` MEDIUMTEXT NOT NULL,
-	`php_script_construct` MEDIUMTEXT NOT NULL,
-	`readme` TEXT NOT NULL,
+	`mod_code` TEXT NULL,
+	`module_version` CHAR(64) NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_method_uninstall` MEDIUMTEXT NULL,
+	`php_postflight_install` MEDIUMTEXT NULL,
+	`php_postflight_update` MEDIUMTEXT NULL,
+	`php_preflight_install` MEDIUMTEXT NULL,
+	`php_preflight_uninstall` MEDIUMTEXT NULL,
+	`php_preflight_update` MEDIUMTEXT NULL,
+	`php_script_construct` MEDIUMTEXT NULL,
+	`readme` TEXT NULL,
 	`sales_server` INT(11) NOT NULL DEFAULT 0,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
-	`sql` MEDIUMTEXT NOT NULL,
-	`sql_uninstall` MEDIUMTEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`sql` MEDIUMTEXT NULL,
+	`sql_uninstall` MEDIUMTEXT NULL,
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`target` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server` INT(11) NOT NULL DEFAULT 0,
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
@@ -261,26 +261,26 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
 	`class_extends` INT(11) NOT NULL DEFAULT 0,
 	`description` TEXT NULL,
 	`fields` TEXT NOT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`head` TEXT NULL,
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`main_class_code` MEDIUMTEXT NOT NULL,
+	`main_class_code` MEDIUMTEXT NULL,
 	`method_selection` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_method_uninstall` MEDIUMTEXT NOT NULL,
-	`php_postflight_install` MEDIUMTEXT NOT NULL,
-	`php_postflight_update` MEDIUMTEXT NOT NULL,
-	`php_preflight_install` MEDIUMTEXT NOT NULL,
-	`php_preflight_uninstall` MEDIUMTEXT NOT NULL,
-	`php_preflight_update` MEDIUMTEXT NOT NULL,
-	`php_script_construct` MEDIUMTEXT NOT NULL,
-	`plugin_version` CHAR(64) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_method_uninstall` MEDIUMTEXT NULL,
+	`php_postflight_install` MEDIUMTEXT NULL,
+	`php_postflight_update` MEDIUMTEXT NULL,
+	`php_preflight_install` MEDIUMTEXT NULL,
+	`php_preflight_uninstall` MEDIUMTEXT NULL,
+	`php_preflight_update` MEDIUMTEXT NULL,
+	`php_script_construct` MEDIUMTEXT NULL,
+	`plugin_version` CHAR(64) NULL DEFAULT '',
 	`property_selection` TEXT NOT NULL,
-	`readme` TEXT NOT NULL,
+	`readme` TEXT NULL,
 	`sales_server` INT(11) NOT NULL DEFAULT 0,
-	`sql` MEDIUMTEXT NOT NULL,
-	`sql_uninstall` MEDIUMTEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`sql` MEDIUMTEXT NULL,
+	`sql_uninstall` MEDIUMTEXT NULL,
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`update_server` INT(11) NOT NULL DEFAULT 0,
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
@@ -326,9 +326,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_power` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`description` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`settings` TEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -364,19 +364,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_power` (
 	`extends_custom` VARCHAR(64) NULL DEFAULT '',
 	`extendsinterfaces` TEXT NULL,
 	`extendsinterfaces_custom` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`head` TEXT NULL,
 	`implements` TEXT NULL,
-	`implements_custom` VARCHAR(1024) NOT NULL DEFAULT '',
+	`implements_custom` VARCHAR(1024) NULL DEFAULT '',
 	`licensing_template` TEXT NULL,
 	`load_selection` TEXT NULL,
-	`main_class_code` MEDIUMTEXT NOT NULL,
+	`main_class_code` MEDIUMTEXT NULL,
 	`method_selection` TEXT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`namespace` VARCHAR(255) NOT NULL DEFAULT '',
-	`power_version` CHAR(64) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`namespace` VARCHAR(255) NULL DEFAULT '',
+	`power_version` CHAR(64) NULL DEFAULT '',
 	`property_selection` TEXT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`type` VARCHAR(64) NOT NULL DEFAULT '',
 	`use_selection` TEXT NULL,
 	`params` TEXT NULL,
@@ -441,66 +441,66 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_php_postsavehook` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_save` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
-	`addlinked_views` TEXT NOT NULL,
-	`addpermissions` TEXT NOT NULL,
-	`addtables` TEXT NOT NULL,
-	`addtabs` TEXT NOT NULL,
-	`ajax_input` TEXT NOT NULL,
+	`addlinked_views` TEXT NULL,
+	`addpermissions` TEXT NULL,
+	`addtables` TEXT NULL,
+	`addtabs` TEXT NULL,
+	`ajax_input` TEXT NULL,
 	`alias_builder` VARCHAR(255) NOT NULL DEFAULT '',
 	`alias_builder_type` TINYINT(1) NOT NULL DEFAULT 0,
-	`css_view` TEXT NOT NULL,
-	`css_views` TEXT NOT NULL,
-	`custom_button` TEXT NOT NULL,
+	`css_view` TEXT NULL,
+	`css_views` TEXT NULL,
+	`custom_button` TEXT NULL,
 	`description` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`html_import_view` MEDIUMTEXT NOT NULL,
+	`guid` VARCHAR(36) NULL DEFAULT '',
+	`html_import_view` MEDIUMTEXT NULL,
 	`icon` VARCHAR(255) NOT NULL DEFAULT '',
 	`icon_add` VARCHAR(255) NOT NULL DEFAULT '',
 	`icon_category` VARCHAR(255) NOT NULL DEFAULT '',
-	`javascript_view_file` TEXT NOT NULL,
-	`javascript_view_footer` TEXT NOT NULL,
-	`javascript_views_file` TEXT NOT NULL,
-	`javascript_views_footer` TEXT NOT NULL,
+	`javascript_view_file` TEXT NULL,
+	`javascript_view_footer` TEXT NULL,
+	`javascript_views_file` TEXT NULL,
+	`javascript_views_footer` TEXT NULL,
 	`mysql_table_charset` VARCHAR(64) NOT NULL DEFAULT 1,
 	`mysql_table_collate` VARCHAR(64) NOT NULL DEFAULT 1,
 	`mysql_table_engine` VARCHAR(64) NOT NULL DEFAULT 1,
 	`mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0,
-	`name_list` CHAR(64) NOT NULL DEFAULT '',
-	`name_single` CHAR(64) NOT NULL DEFAULT '',
-	`php_after_cancel` MEDIUMTEXT NOT NULL,
-	`php_after_delete` MEDIUMTEXT NOT NULL,
-	`php_after_publish` MEDIUMTEXT NOT NULL,
-	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
-	`php_allowadd` MEDIUMTEXT NOT NULL,
-	`php_allowedit` MEDIUMTEXT NOT NULL,
-	`php_batchcopy` MEDIUMTEXT NOT NULL,
-	`php_batchmove` MEDIUMTEXT NOT NULL,
-	`php_before_cancel` MEDIUMTEXT NOT NULL,
-	`php_before_delete` MEDIUMTEXT NOT NULL,
-	`php_before_publish` MEDIUMTEXT NOT NULL,
-	`php_before_save` MEDIUMTEXT NOT NULL,
-	`php_controller` MEDIUMTEXT NOT NULL,
-	`php_controller_list` MEDIUMTEXT NOT NULL,
-	`php_document` MEDIUMTEXT NOT NULL,
-	`php_getform` MEDIUMTEXT NOT NULL,
-	`php_getitem` MEDIUMTEXT NOT NULL,
-	`php_getitems` MEDIUMTEXT NOT NULL,
-	`php_getitems_after_all` MEDIUMTEXT NOT NULL,
-	`php_getlistquery` MEDIUMTEXT NOT NULL,
-	`php_import` MEDIUMTEXT NOT NULL,
-	`php_import_display` MEDIUMTEXT NOT NULL,
-	`php_import_ext` MEDIUMTEXT NOT NULL,
-	`php_import_headers` MEDIUMTEXT NOT NULL,
-	`php_import_save` MEDIUMTEXT NOT NULL,
-	`php_import_setdata` MEDIUMTEXT NOT NULL,
-	`php_model` MEDIUMTEXT NOT NULL,
-	`php_model_list` MEDIUMTEXT NOT NULL,
-	`php_postsavehook` MEDIUMTEXT NOT NULL,
-	`php_save` MEDIUMTEXT NOT NULL,
-	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
+	`name_list` CHAR(64) NULL DEFAULT '',
+	`name_single` CHAR(64) NULL DEFAULT '',
+	`php_after_cancel` MEDIUMTEXT NULL,
+	`php_after_delete` MEDIUMTEXT NULL,
+	`php_after_publish` MEDIUMTEXT NULL,
+	`php_ajaxmethod` MEDIUMTEXT NULL,
+	`php_allowadd` MEDIUMTEXT NULL,
+	`php_allowedit` MEDIUMTEXT NULL,
+	`php_batchcopy` MEDIUMTEXT NULL,
+	`php_batchmove` MEDIUMTEXT NULL,
+	`php_before_cancel` MEDIUMTEXT NULL,
+	`php_before_delete` MEDIUMTEXT NULL,
+	`php_before_publish` MEDIUMTEXT NULL,
+	`php_before_save` MEDIUMTEXT NULL,
+	`php_controller` MEDIUMTEXT NULL,
+	`php_controller_list` MEDIUMTEXT NULL,
+	`php_document` MEDIUMTEXT NULL,
+	`php_getform` MEDIUMTEXT NULL,
+	`php_getitem` MEDIUMTEXT NULL,
+	`php_getitems` MEDIUMTEXT NULL,
+	`php_getitems_after_all` MEDIUMTEXT NULL,
+	`php_getlistquery` MEDIUMTEXT NULL,
+	`php_import` MEDIUMTEXT NULL,
+	`php_import_display` MEDIUMTEXT NULL,
+	`php_import_ext` MEDIUMTEXT NULL,
+	`php_import_headers` MEDIUMTEXT NULL,
+	`php_import_save` MEDIUMTEXT NULL,
+	`php_import_setdata` MEDIUMTEXT NULL,
+	`php_model` MEDIUMTEXT NULL,
+	`php_model_list` MEDIUMTEXT NULL,
+	`php_postsavehook` MEDIUMTEXT NULL,
+	`php_save` MEDIUMTEXT NULL,
+	`short_description` VARCHAR(255) NULL DEFAULT '',
 	`source` TINYINT(1) NOT NULL DEFAULT 0,
-	`sql` MEDIUMTEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`sql` MEDIUMTEXT NULL,
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`type` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -575,32 +575,32 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`ajax_input` TEXT NOT NULL,
-	`codename` VARCHAR(255) NOT NULL DEFAULT '',
-	`context` VARCHAR(255) NOT NULL DEFAULT '',
-	`css` TEXT NOT NULL,
-	`css_document` TEXT NOT NULL,
-	`custom_button` TEXT NOT NULL,
-	`custom_get` TEXT NOT NULL,
-	`default` MEDIUMTEXT NOT NULL,
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
+	`ajax_input` TEXT NULL,
+	`codename` VARCHAR(255) NULL DEFAULT '',
+	`context` VARCHAR(255) NULL DEFAULT '',
+	`css` TEXT NULL,
+	`css_document` TEXT NULL,
+	`custom_button` TEXT NULL,
+	`custom_get` TEXT NULL,
+	`default` MEDIUMTEXT NULL,
+	`description` VARCHAR(255) NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`icon` VARCHAR(255) NOT NULL DEFAULT '',
-	`javascript_file` TEXT NOT NULL,
-	`js_document` TEXT NOT NULL,
+	`javascript_file` TEXT NULL,
+	`js_document` TEXT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
-	`php_controller` MEDIUMTEXT NOT NULL,
-	`php_document` MEDIUMTEXT NOT NULL,
-	`php_jview` MEDIUMTEXT NOT NULL,
-	`php_jview_display` MEDIUMTEXT NOT NULL,
-	`php_model` MEDIUMTEXT NOT NULL,
-	`php_view` MEDIUMTEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_ajaxmethod` MEDIUMTEXT NULL,
+	`php_controller` MEDIUMTEXT NULL,
+	`php_document` MEDIUMTEXT NULL,
+	`php_jview` MEDIUMTEXT NULL,
+	`php_jview_display` MEDIUMTEXT NULL,
+	`php_model` MEDIUMTEXT NULL,
+	`php_view` MEDIUMTEXT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -650,32 +650,32 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`ajax_input` TEXT NOT NULL,
+	`ajax_input` TEXT NULL,
 	`button_position` TINYINT(1) NOT NULL DEFAULT 1,
-	`codename` VARCHAR(255) NOT NULL DEFAULT '',
-	`context` VARCHAR(255) NOT NULL DEFAULT '',
-	`css` TEXT NOT NULL,
-	`css_document` TEXT NOT NULL,
-	`custom_button` TEXT NOT NULL,
-	`custom_get` TEXT NOT NULL,
-	`default` MEDIUMTEXT NOT NULL,
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
+	`codename` VARCHAR(255) NULL DEFAULT '',
+	`context` VARCHAR(255) NULL DEFAULT '',
+	`css` TEXT NULL,
+	`css_document` TEXT NULL,
+	`custom_button` TEXT NULL,
+	`custom_get` TEXT NULL,
+	`default` MEDIUMTEXT NULL,
+	`description` VARCHAR(255) NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`javascript_file` TEXT NOT NULL,
-	`js_document` TEXT NOT NULL,
+	`guid` VARCHAR(36) NULL DEFAULT '',
+	`javascript_file` TEXT NULL,
+	`js_document` TEXT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
-	`php_controller` MEDIUMTEXT NOT NULL,
-	`php_document` MEDIUMTEXT NOT NULL,
-	`php_jview` MEDIUMTEXT NOT NULL,
-	`php_jview_display` MEDIUMTEXT NOT NULL,
-	`php_model` MEDIUMTEXT NOT NULL,
-	`php_view` MEDIUMTEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_ajaxmethod` MEDIUMTEXT NULL,
+	`php_controller` MEDIUMTEXT NULL,
+	`php_document` MEDIUMTEXT NULL,
+	`php_jview` MEDIUMTEXT NULL,
+	`php_jview_display` MEDIUMTEXT NULL,
+	`php_model` MEDIUMTEXT NULL,
+	`php_view` MEDIUMTEXT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -717,14 +717,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`alias` VARCHAR(255) NOT NULL DEFAULT '',
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
+	`alias` VARCHAR(255) NULL DEFAULT '',
+	`description` VARCHAR(255) NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`libraries` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_view` MEDIUMTEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_view` MEDIUMTEXT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
-	`template` TEXT NOT NULL,
+	`template` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -753,13 +753,13 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
-	`alias` VARCHAR(255) NOT NULL DEFAULT '',
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
+	`alias` VARCHAR(255) NULL DEFAULT '',
+	`description` VARCHAR(255) NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
-	`layout` TEXT NOT NULL,
+	`layout` TEXT NULL,
 	`libraries` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_view` MEDIUMTEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_view` MEDIUMTEXT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -795,33 +795,33 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_router_parse` TINYINT(1) NOT NULL DEFAULT 0,
 	`addcalculation` TINYINT(1) NOT NULL DEFAULT 0,
-	`db_selection` TEXT NOT NULL,
+	`db_selection` TEXT NULL,
 	`db_table_main` VARCHAR(255) NOT NULL DEFAULT '',
-	`filter` TEXT NOT NULL,
-	`getcustom` VARCHAR(255) NOT NULL DEFAULT '',
+	`filter` TEXT NULL,
+	`getcustom` VARCHAR(255) NULL DEFAULT '',
 	`gettype` TINYINT(1) NOT NULL DEFAULT 0,
-	`global` TEXT NOT NULL,
+	`global` TEXT NULL,
 	`group` TEXT NOT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`join_db_table` TEXT NOT NULL,
-	`join_view_table` TEXT NOT NULL,
+	`guid` VARCHAR(36) NULL DEFAULT '',
+	`join_db_table` TEXT NULL,
+	`join_view_table` TEXT NULL,
 	`main_source` TINYINT(1) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`order` TEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`order` TEXT NULL,
 	`pagination` TINYINT(1) NOT NULL DEFAULT 1,
-	`php_after_getitem` MEDIUMTEXT NOT NULL,
-	`php_after_getitems` MEDIUMTEXT NOT NULL,
-	`php_before_getitem` MEDIUMTEXT NOT NULL,
-	`php_before_getitems` MEDIUMTEXT NOT NULL,
-	`php_calculation` MEDIUMTEXT NOT NULL,
-	`php_custom_get` MEDIUMTEXT NOT NULL,
-	`php_getlistquery` MEDIUMTEXT NOT NULL,
-	`php_router_parse` MEDIUMTEXT NOT NULL,
+	`php_after_getitem` MEDIUMTEXT NULL,
+	`php_after_getitems` MEDIUMTEXT NULL,
+	`php_before_getitem` MEDIUMTEXT NULL,
+	`php_before_getitems` MEDIUMTEXT NULL,
+	`php_calculation` MEDIUMTEXT NULL,
+	`php_custom_get` MEDIUMTEXT NULL,
+	`php_getlistquery` MEDIUMTEXT NULL,
+	`php_router_parse` MEDIUMTEXT NULL,
 	`plugin_events` VARCHAR(255) NOT NULL DEFAULT '',
 	`select_all` TINYINT(1) NOT NULL DEFAULT 0,
-	`view_selection` TEXT NOT NULL,
+	`view_selection` TEXT NULL,
 	`view_table_main` INT(11) NOT NULL DEFAULT 0,
-	`where` TEXT NOT NULL,
+	`where` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -858,18 +858,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`code` MEDIUMTEXT NOT NULL,
+	`code` MEDIUMTEXT NULL,
 	`comment_type` TINYINT(1) NOT NULL DEFAULT 1,
 	`component` INT(11) NOT NULL DEFAULT 0,
-	`from_line` VARCHAR(100) NOT NULL DEFAULT '',
-	`function_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`hashendtarget` VARCHAR(64) NOT NULL DEFAULT '',
-	`hashtarget` VARCHAR(64) NOT NULL DEFAULT '',
+	`from_line` VARCHAR(100) NULL DEFAULT '',
+	`function_name` VARCHAR(255) NULL DEFAULT '',
+	`hashendtarget` VARCHAR(64) NULL DEFAULT '',
+	`hashtarget` VARCHAR(64) NULL DEFAULT '',
 	`joomla_version` INT(11) NOT NULL DEFAULT 3,
-	`path` TEXT NOT NULL,
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`path` TEXT NULL,
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`target` TINYINT(1) NOT NULL DEFAULT 0,
-	`to_line` VARCHAR(100) NOT NULL DEFAULT '',
+	`to_line` VARCHAR(100) NULL DEFAULT '',
 	`type` TINYINT(1) NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -900,12 +900,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`comment` TEXT NOT NULL,
-	`default` TEXT NOT NULL,
+	`comment` TEXT NULL,
+	`default` TEXT NULL,
 	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -934,13 +934,13 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`arguments` TEXT NOT NULL,
-	`code` MEDIUMTEXT NOT NULL,
-	`comment` TEXT NOT NULL,
+	`arguments` TEXT NULL,
+	`code` MEDIUMTEXT NULL,
+	`comment` TEXT NULL,
 	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -969,8 +969,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_placeholder` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`target` VARCHAR(255) NOT NULL DEFAULT '',
-	`value` TEXT NOT NULL,
+	`target` VARCHAR(255) NULL DEFAULT '',
+	`value` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -996,12 +996,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addconditions` MEDIUMTEXT NOT NULL,
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`description` VARCHAR(255) NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`how` TINYINT(1) NOT NULL DEFAULT 1,
 	`libraries` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php_setdocument` MEDIUMTEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php_setdocument` MEDIUMTEXT NULL,
 	`target` TINYINT(1) NOT NULL DEFAULT 1,
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
@@ -1030,19 +1030,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`contributor_company` VARCHAR(255) NOT NULL DEFAULT '',
-	`contributor_email` VARCHAR(255) NOT NULL DEFAULT '',
-	`contributor_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`contributor_website` VARCHAR(255) NOT NULL DEFAULT '',
+	`contributor_company` VARCHAR(255) NULL DEFAULT '',
+	`contributor_email` VARCHAR(255) NULL DEFAULT '',
+	`contributor_name` VARCHAR(255) NULL DEFAULT '',
+	`contributor_website` VARCHAR(255) NULL DEFAULT '',
 	`description` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`heading` VARCHAR(255) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
+	`heading` VARCHAR(255) NULL DEFAULT '',
 	`library` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`snippet` TEXT NOT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`snippet` TEXT NULL,
 	`type` INT(11) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
-	`usage` TEXT NOT NULL,
+	`usage` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1071,9 +1071,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_validation_rule` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`inherit` CHAR(64) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`php` MEDIUMTEXT NOT NULL,
-	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
+	`php` MEDIUMTEXT NULL,
+	`short_description` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1103,26 +1103,26 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
 	`catid` INT(11) NOT NULL DEFAULT 0,
-	`css_view` TEXT NOT NULL,
-	`css_views` TEXT NOT NULL,
+	`css_view` TEXT NULL,
+	`css_views` TEXT NULL,
 	`datadefault` CHAR(64) NOT NULL DEFAULT '',
-	`datadefault_other` CHAR(64) NOT NULL DEFAULT '',
+	`datadefault_other` CHAR(64) NULL DEFAULT '',
 	`datalenght` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght_other` CHAR(64) NOT NULL DEFAULT '',
+	`datalenght_other` CHAR(64) NULL DEFAULT '',
 	`datatype` CHAR(64) NOT NULL DEFAULT '',
 	`fieldtype` INT(11) NOT NULL DEFAULT 0,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`indexes` CHAR(64) NOT NULL DEFAULT '',
-	`initiator_on_get_model` TEXT NOT NULL,
-	`initiator_on_save_model` TEXT NOT NULL,
-	`javascript_view_footer` TEXT NOT NULL,
-	`javascript_views_footer` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`initiator_on_get_model` TEXT NULL,
+	`initiator_on_save_model` TEXT NULL,
+	`javascript_view_footer` TEXT NULL,
+	`javascript_views_footer` TEXT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`null_switch` CHAR(64) NOT NULL DEFAULT '',
-	`on_get_model_field` TEXT NOT NULL,
-	`on_save_model_field` TEXT NOT NULL,
+	`on_get_model_field` TEXT NULL,
+	`on_save_model_field` TEXT NULL,
 	`store` INT(11) NOT NULL DEFAULT 0,
-	`xml` TEXT NOT NULL,
+	`xml` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1163,18 +1163,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` (
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`catid` INT(11) NOT NULL DEFAULT 0,
 	`datadefault` CHAR(64) NOT NULL DEFAULT '',
-	`datadefault_other` CHAR(64) NOT NULL DEFAULT '',
+	`datadefault_other` CHAR(64) NULL DEFAULT '',
 	`datalenght` CHAR(64) NOT NULL DEFAULT '',
-	`datalenght_other` CHAR(64) NOT NULL DEFAULT '',
+	`datalenght_other` CHAR(64) NULL DEFAULT '',
 	`datatype` CHAR(64) NOT NULL DEFAULT '',
 	`description` TEXT NULL,
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
 	`has_defaults` TINYINT(1) NOT NULL DEFAULT 0,
 	`indexes` CHAR(64) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`null_switch` CHAR(64) NOT NULL DEFAULT '',
-	`properties` TEXT NOT NULL,
-	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
+	`properties` TEXT NULL,
+	`short_description` VARCHAR(255) NULL DEFAULT '',
 	`store` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1213,7 +1213,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` (
 	`components` TEXT NULL,
 	`modules` TEXT NULL,
 	`plugins` TEXT NULL,
-	`source` MEDIUMTEXT NOT NULL,
+	`source` MEDIUMTEXT NULL,
 	`translation` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1238,8 +1238,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_language` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`langtag` VARCHAR(64) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`langtag` VARCHAR(64) NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1265,17 +1265,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`authentication` TINYINT(1) NOT NULL DEFAULT 0,
-	`host` TEXT NOT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`host` TEXT NULL,
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`password` TEXT NOT NULL,
-	`path` TEXT NOT NULL,
-	`port` TEXT NOT NULL,
-	`private` TEXT NOT NULL,
-	`private_key` TEXT NOT NULL,
+	`path` TEXT NULL,
+	`port` TEXT NULL,
+	`private` TEXT NULL,
+	`private_key` TEXT NULL,
 	`protocol` TINYINT(1) NOT NULL DEFAULT 0,
 	`secret` TEXT NOT NULL,
-	`signature` TEXT NOT NULL,
-	`username` TEXT NOT NULL,
+	`signature` TEXT NULL,
+	`username` TEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1304,11 +1304,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_repository` (
 	`access_repo` TINYINT(1) NULL DEFAULT 0,
 	`addplaceholders` TEXT NULL,
 	`base` VARCHAR(255) NOT NULL DEFAULT '',
-	`guid` VARCHAR(36) NOT NULL DEFAULT '',
-	`organisation` VARCHAR(255) NOT NULL DEFAULT '',
+	`guid` VARCHAR(36) NULL DEFAULT '',
+	`organisation` VARCHAR(255) NULL DEFAULT '',
 	`read_branch` VARCHAR(255) NULL DEFAULT '',
-	`repository` VARCHAR(255) NOT NULL DEFAULT '',
-	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
+	`repository` VARCHAR(255) NULL DEFAULT '',
+	`system_name` VARCHAR(255) NULL DEFAULT '',
 	`target` TINYINT(7) NOT NULL DEFAULT 1,
 	`token` VARCHAR(255) NULL DEFAULT '',
 	`type` TINYINT(1) NOT NULL DEFAULT 1,
@@ -1349,14 +1349,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`admin_view` CHAR(255) NOT NULL DEFAULT '',
-	`alias` CHAR(64) NOT NULL DEFAULT '',
+	`alias` CHAR(64) NULL DEFAULT '',
 	`article` TINYINT(1) NOT NULL DEFAULT 0,
-	`content` TEXT NOT NULL,
-	`groups` TEXT NOT NULL,
+	`content` TEXT NULL,
+	`groups` TEXT NULL,
 	`location` TINYINT(1) NOT NULL DEFAULT 0,
 	`site_view` CHAR(255) NOT NULL DEFAULT '',
 	`target` TINYINT(1) NOT NULL DEFAULT 0,
-	`title` CHAR(64) NOT NULL DEFAULT '',
+	`title` CHAR(64) NULL DEFAULT '',
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` TEXT NULL,
@@ -1490,7 +1490,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_custom_tabs` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addadmin_views` TEXT NOT NULL,
+	`addadmin_views` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1516,7 +1516,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addsite_views` TEXT NOT NULL,
+	`addsite_views` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1542,7 +1542,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_views` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addcustom_admin_views` TEXT NOT NULL,
+	`addcustom_admin_views` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1620,7 +1620,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_mysql_tweaks` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addcustommenus` TEXT NOT NULL,
+	`addcustommenus` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1646,11 +1646,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_router` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`constructor_after_parent_code` MEDIUMTEXT NOT NULL,
-	`constructor_before_parent_code` MEDIUMTEXT NOT NULL,
+	`constructor_after_parent_code` MEDIUMTEXT NULL,
+	`constructor_before_parent_code` MEDIUMTEXT NULL,
 	`constructor_before_parent_manual` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`methods_code` MEDIUMTEXT NOT NULL,
+	`methods_code` MEDIUMTEXT NULL,
 	`mode_constructor_after_parent` TINYINT(1) NOT NULL DEFAULT 0,
 	`mode_constructor_before_parent` TINYINT(1) NOT NULL DEFAULT 0,
 	`mode_methods` TINYINT(1) NOT NULL DEFAULT 0,
@@ -1678,7 +1678,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_router` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconfig` TEXT NOT NULL,
+	`addconfig` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1704,9 +1704,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`dashboard_tab` TEXT NOT NULL,
+	`dashboard_tab` TEXT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`php_dashboard_methods` MEDIUMTEXT NOT NULL,
+	`php_dashboard_methods` MEDIUMTEXT NULL,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1731,9 +1731,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_files_folders` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
+	`addfiles` TEXT NULL,
 	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
+	`addfolders` TEXT NULL,
 	`addfoldersfullpath` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
@@ -1838,8 +1838,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_modules` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`description` VARCHAR(255) NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1864,7 +1864,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addconfig` TEXT NOT NULL,
+	`addconfig` TEXT NULL,
 	`library` INT(11) NOT NULL DEFAULT 0,
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
@@ -1890,9 +1890,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
+	`addfiles` TEXT NULL,
 	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
+	`addfolders` TEXT NULL,
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`library` INT(11) NOT NULL DEFAULT 0,
@@ -1920,10 +1920,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_extends` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`comment` TEXT NOT NULL,
+	`comment` TEXT NULL,
 	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
 	`head` TEXT NULL,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -1974,9 +1974,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_updates` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_files_folders_urls` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
+	`addfiles` TEXT NULL,
 	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
+	`addfolders` TEXT NULL,
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`joomla_module` INT(11) NOT NULL DEFAULT 0,
@@ -2005,7 +2005,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`class_extends` INT(11) NOT NULL DEFAULT 0,
-	`name` VARCHAR(255) NOT NULL DEFAULT '',
+	`name` VARCHAR(255) NULL DEFAULT '',
 	`params` TEXT NULL,
 	`published` TINYINT(3) NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NULL DEFAULT 0,
@@ -2057,9 +2057,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`addfiles` TEXT NOT NULL,
+	`addfiles` TEXT NULL,
 	`addfilesfullpath` TEXT NOT NULL,
-	`addfolders` TEXT NOT NULL,
+	`addfolders` TEXT NULL,
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
@@ -2160,7 +2160,7 @@ INSERT INTO `#__componentbuilder_dynamic_get` (`id`, `add_php_after_getitem`, `a
 --
 
 INSERT INTO `#__componentbuilder_custom_code` (`id`, `code`, `component`, `comment_type`, `from_line`, `function_name`, `hashtarget`, `hashendtarget`, `path`, `system_name`, `target`, `to_line`, `type`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(5, 'CS8qKg0KCSAqIENoYW5nZSB0byBuaWNlIGZhbmN5IGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF0ZSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2pTIFxvXGYgRiBZJywkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogZ2V0IGRhdGUgYmFzZWQgaW4gcGVyaW9kIHBhc3QNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RHluYW1pY0RhdGUoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCS8vIG9sZGVyIHRoZW4geWVhcg0KCQkkbGFzdHllYXIgPSBkYXRlKCJZIiwgc3RydG90aW1lKCItMSB5ZWFyIikpOw0KCQkkdHJhZ2V0eWVhciA9IGRhdGUoIlkiLCAkZGF0ZSk7DQoJCWlmICgkdHJhZ2V0eWVhciA8PSAkbGFzdHllYXIpDQoJCXsNCgkJCXJldHVybiBkYXRlKCdtL2QveScsICRkYXRlKTsNCgkJfQ0KCQkvLyBzYW1lIGRheQ0KCQkkeWVzdGVyZGF5ID0gc3RydG90aW1lKCItMSBkYXkiKTsNCgkJaWYgKCRkYXRlID4gJHllc3RlcmRheSkNCgkJew0KCQkJcmV0dXJuIGRhdGUoJ2c6aSBBJywgJGRhdGUpOw0KCQl9DQoJCS8vIGp1c3QgbW9udGggZGF5DQoJCXJldHVybiBkYXRlKCdNIGonLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgZmFuY3kgZGF5IHRpbWUgYW5kIGRhdGUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5RGF5VGltZURhdGUoJHRpbWUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCR0aW1lKSkNCgkJew0KCQkJJHRpbWUgPSBzdHJ0b3RpbWUoJHRpbWUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdEIGdhIGpTIFxvXGYgRiBZJywkdGltZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgZmFuY3kgdGltZSBhbmQgZGF0ZQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gZmFuY3lEYXRlVGltZSgkdGltZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJyhHOmkpIGpTIFxvXGYgRiBZJywkdGltZSk7DQoJfQ0KDQoJLyoqDQoJICogQ2hhbmdlIHRvIG5pY2UgaG91cjptaW51dGVzIHRpbWUNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIGZhbmN5VGltZSgkdGltZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJHRpbWUpKQ0KCQl7DQoJCQkkdGltZSA9IHN0cnRvdGltZSgkdGltZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0c6aScsJHRpbWUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBkYXkgYXMgU3VuZGF5IHRocm91Z2ggU2F0dXJkYXkNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheU5hbWUoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdsJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBtb250aCBhcyBKYW51YXJ5IHRocm91Z2ggRGVjZW1iZXINCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldE1vbnRoTmFtZSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ0YnLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGRheSBhcyAxc3QNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheSgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2pTJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBtb250aCBhcyA1DQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBzZXRNb250aCgkZGF0ZSwgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ24nLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIHllYXIgYXMgMjAwNCAoZm9yIGNoYXJ0cykNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldFllYXIoJGRhdGUsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdZJywgJGRhdGUpOw0KCX0NCg0KCS8qKg0KCSAqIHNldCB0aGUgZGF0ZSBhcyAyMDA0LzA1IChmb3IgY2hhcnRzKQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gc2V0WWVhck1vbnRoKCRkYXRlLCAkc3BhY2VyID0gJy8nLCAkY2hlY2tfc3RhbXAgPSB0cnVlKQ0KCXsNCgkJaWYgKCRjaGVja19zdGFtcCAmJiAhc2VsZjo6aXNWYWxpZFRpbWVTdGFtcCgkZGF0ZSkpDQoJCXsNCgkJCSRkYXRlID0gc3RydG90aW1lKCRkYXRlKTsNCgkJfQ0KCQlyZXR1cm4gZGF0ZSgnWScgLiAkc3BhY2VyIC4gJ20nLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGFzIDIwMDQvMDUvMDMgKGZvciBjaGFydHMpDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBzZXRZZWFyTW9udGhEYXkoJGRhdGUsICRzcGFjZXIgPSAnLycsICRjaGVja19zdGFtcCA9IHRydWUpDQoJew0KCQlpZiAoJGNoZWNrX3N0YW1wICYmICFzZWxmOjppc1ZhbGlkVGltZVN0YW1wKCRkYXRlKSkNCgkJew0KCQkJJGRhdGUgPSBzdHJ0b3RpbWUoJGRhdGUpOw0KCQl9DQoJCXJldHVybiBkYXRlKCdZJyAuICRzcGFjZXIgLiAnbScgLiAkc3BhY2VyIC4gJ2QnLCAkZGF0ZSk7DQoJfQ0KDQoJLyoqDQoJICogc2V0IHRoZSBkYXRlIGFzIDAzLzA1LzIwMDQNCgkgKi8NCglwdWJsaWMgc3RhdGljIGZ1bmN0aW9uIHNldERheU1vbnRoWWVhcigkZGF0ZSwgJHNwYWNlciA9ICcvJywgJGNoZWNrX3N0YW1wID0gdHJ1ZSkNCgl7DQoJCWlmICgkY2hlY2tfc3RhbXAgJiYgIXNlbGY6OmlzVmFsaWRUaW1lU3RhbXAoJGRhdGUpKQ0KCQl7DQoJCQkkZGF0ZSA9IHN0cnRvdGltZSgkZGF0ZSk7DQoJCX0NCgkJcmV0dXJuIGRhdGUoJ2QnIC4gJHNwYWNlciAuICdtJyAuICRzcGFjZXIgLiAnWScsICRkYXRlKTsNCgl9DQoNCgkvKioNCgkgKiBDaGVjayBpZiBzdHJpbmcgaXMgYSB2YWxpZCB0aW1lIHN0YW1wDQoJICovDQoJcHVibGljIHN0YXRpYyBmdW5jdGlvbiBpc1ZhbGlkVGltZVN0YW1wKCR0aW1lc3RhbXApDQoJew0KCQlyZXR1cm4gKChpbnQpICR0aW1lc3RhbXAgPT09ICR0aW1lc3RhbXApDQoJCSYmICgkdGltZXN0YW1wIDw9IFBIUF9JTlRfTUFYKQ0KCQkmJiAoJHRpbWVzdGFtcCA+PSB+UEhQX0lOVF9NQVgpOw0KCX0NCg0KCS8qKg0KCSAqIENoZWNrIGlmIHN0cmluZyBpcyBhIHZhbGlkIGRhdGUNCgkgKiBodHRwczovL3d3dy5waHAubmV0L21hbnVhbC9lbi9mdW5jdGlvbi5jaGVja2RhdGUucGhwIzExMzIwNQ0KCSAqLw0KCXB1YmxpYyBzdGF0aWMgZnVuY3Rpb24gaXNWYWxpZGF0ZURhdGUoJGRhdGUsICRmb3JtYXQgPSAnWS1tLWQgSDppOnMnKQ0KCXsNCgkJJGQgPSBEYXRlVGltZTo6Y3JlYXRlRnJvbUZvcm1hdCgkZm9ybWF0LCAkZGF0ZSk7DQoJCXJldHVybiAkZCAmJiAkZC0+Zm9ybWF0KCRmb3JtYXQpID09ICRkYXRlOw0KCX0=', '', 1, '', 'niceFancyDate', '', '', '', 'helper::fancyDate($date)', 2, '', '', '', 1, '2017-02-11 02:02:46', '2024-09-16 00:16:48', 18, '', 3),
+(5, '	/**
	 * Convert a date to a human-readable fancy format (e.g., "1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDate($date, $checkStamp);
	 */
	public static function fancyDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDate($date, $checkStamp);
	}

	/**
	 * Get a formatted date based on the time period (dynamic format based on age of the date).
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDynamicDate($date, $checkStamp);
	 */
	public static function fancyDynamicDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDynamicDate($date, $checkStamp);
	}

	/**
	 * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted day, time, and date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDayTimeDate($date, $checkStamp);
	 */
	public static function fancyDayTimeDate($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDayTimeDate($date, $checkStamp);
	}

	/**
	 * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted time and date.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDateTime($date, $checkStamp);
	 */
	public static function fancyDateTime($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyDateTime($date, $checkStamp);
	}

	/**
	 * Convert a time to a human-readable format (e.g., "12:00").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Formatted time.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyTime($date, $checkStamp);
	 */
	public static function fancyTime($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::fancyTime($date, $checkStamp);
	}

	/**
	 * Convert a date to the day name (e.g., "Sunday").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day name.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayName($date, $checkStamp);
	 */
	public static function setDayName($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayName($date, $checkStamp);
	}

	/**
	 * Convert a date to the month name (e.g., "January").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Month name.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonthName($date, $checkStamp);
	 */
	public static function setMonthName($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonthName($date, $checkStamp);
	}

	/**
	 * Convert a date to the day with suffix (e.g., "1st").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day with suffix.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDay($date, $checkStamp);
	 */
	public static function setDay($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDay($date, $checkStamp);
	}

	/**
	 * Convert a date to the numeric month (e.g., "5").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Numeric month.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonth($date, $checkStamp);
	 */
	public static function setMonth($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setMonth($date, $checkStamp);
	}

	/**
	 * Convert a date to the full year (e.g., "2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Full year.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYear($date, $checkStamp);
	 */
	public static function setYear($date, bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYear($date, $checkStamp);
	}

	/**
	 * Convert a date to a year/month format (e.g., "2024/05").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Year/Month format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonth($date, $spacer, $checkStamp);
	 */
	public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonth($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date to a year/month/day format (e.g., "2024/05/03").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Year/Month/Day format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonthDay($date, $spacer, $checkStamp);
	 */
	public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setYearMonthDay($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date to a day/month/year format (e.g., "03/05/2024").
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param string      $spacer       The spacer between year and month.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return string Day/Month/Year format.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayMonthYear($date, $spacer, $checkStamp);
	 */
	public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::setDayMonthYear($date, $spacer, $checkStamp);
	}

	/**
	 * Convert a date string to a valid timestamp.
	 *
	 * @param string|int  $date         The date as a string or timestamp.
	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
	 *
	 * @return int The valid timestamp.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::getValidTimestamp($date, $checkStamp);
	 */
	public static function getValidTimestamp($date, bool $checkStamp): int
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::getValidTimestamp($date, $checkStamp);
	}

	/**
	 * Check if the input is a valid Unix timestamp.
	 *
	 * @param mixed $timestamp The timestamp to validate.
	 *
	 * @return bool True if valid timestamp, false otherwise.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidTimeStamp($timestamp);
	 */
	public static function isValidTimeStamp($timestamp): bool
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidTimeStamp($timestamp);
	}

	/**
	 * Check if a string is a valid date according to the specified format.
	 *
	 * @param string $date The date string to validate.
	 * @param string $format The format to check against (default is 'Y-m-d H:i:s').
	 *
	 * @return bool True if valid date, false otherwise.
	 * @since 3.0.0
	 * @deprecated 4.0.0 Use Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidateDate($date, $format);
	 */
	public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool
	{
		return Super___993fe913_8e36_4800_a5f7_544aa728ee48___Power::isValidateDate($date, $format);
	}', '', 1, '', 'niceFancyDate', '', '', '', 'helper::fancyDate($date)', 2, '', '', '', 1, '2017-02-11 02:02:46', '2024-10-10 22:21:19', 19, '', 3),
 (185, 'bmFtZXNwYWNlIFtbW05hbWVzcGFjZVByZWZpeF1dXVxDb21wb25lbnRcW1tbQ29tcG9uZW50TmFtZXNwYWNlXV1dXFtbW2FyZzBdXV1cQ29udHJvbGxlcjsNCg0KdXNlIEpvb21sYVxDTVNcTVZDXENvbnRyb2xsZXJcQmFzZUNvbnRyb2xsZXI7DQoNCi8vIE5vIGRpcmVjdCBhY2Nlc3MgdG8gdGhpcyBmaWxlDQpcZGVmaW5lZCgnX0pFWEVDJykgb3IgZGllOw0KDQovKioNCiAqIFtbW0NvbXBvbmVudF1dXSBbW1thcmcwXV1dIERvd25sb2FkIENvbnRyb2xsZXINCiAqDQogKiBAc2luY2UgNS4wLjINCiAqLw0KY2xhc3MgRG93bmxvYWRDb250cm9sbGVyIGV4dGVuZHMgQmFzZUNvbnRyb2xsZXINCnsNCgkvKioNCgkgKiBUaGUgYXBwbGljYXRpb24gaW5zdGFuY2UuDQoJICoNCgkgKiBAdmFyIFxKb29tbGFcQ01TXEFwcGxpY2F0aW9uXENNU0FwcGxpY2F0aW9uDQoJICogQHNpbmNlICA1LjAuMg0KCSAqLw0KCXByb3RlY3RlZCAkYXBwOw0KDQoJLyoqDQoJICogQ29uc3RydWN0b3IuDQoJICoNCgkgKiBAcGFyYW0gYXJyYXkgJGNvbmZpZyBBbiBvcHRpb25hbCBhc3NvY2lhdGl2ZSBhcnJheSBvZiBjb25maWd1cmF0aW9uIHNldHRpbmdzLg0KCSAqIEBzaW5jZSAgNS4wLjINCgkgKi8NCglwdWJsaWMgZnVuY3Rpb24gX19jb25zdHJ1Y3QoJGNvbmZpZyA9IFtdKQ0KCXsNCgkJcGFyZW50OjpfX2NvbnN0cnVjdCgkY29uZmlnKTsNCg0KCQkvLyBJbml0aWFsaXplIHRoZSBhcHBsaWNhdGlvbg0KCQkkdGhpcy0+YXBwID0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoNCgkJLy8gUmVnaXN0ZXIgdGFza3MNCgkJJHRoaXMtPnJlZ2lzdGVyVGFzaygnZmlsZScsICdkb3dubG9hZEZpbGUnKTsNCgkJJHRoaXMtPnJlZ2lzdGVyVGFzaygnaW1hZ2UnLCAnZG93bmxvYWRJbWFnZScpOw0KCQkkdGhpcy0+cmVnaXN0ZXJUYXNrKCdtZWRpYScsICdkb3dubG9hZE1lZGlhJyk7DQoJfQ0KDQoJLyoqDQoJICogSGFuZGxlcyBmaWxlIGRvd25sb2Fkcy4NCgkgKg0KCSAqIEByZXR1cm4gdm9pZA0KCSAqIEBzaW5jZSAgNS4wLjINCgkgKi8NCglwdWJsaWMgZnVuY3Rpb24gZG93bmxvYWRGaWxlKCkNCgl7DQoJCSR0aGlzLT5wcm9jZXNzRG93bmxvYWQodHJ1ZSk7DQoJfQ0KDQoJLyoqDQoJICogSGFuZGxlcyBpbWFnZSBkb3dubG9hZHMuDQoJICoNCgkgKiBAcmV0dXJuIHZvaWQNCgkgKiBAc2luY2UgIDUuMC4yDQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGRvd25sb2FkSW1hZ2UoKQ0KCXsNCgkJJHRoaXMtPnByb2Nlc3NEb3dubG9hZChmYWxzZSk7DQoJfQ0KDQoJLyoqDQoJICogSGFuZGxlcyBtZWRpYSBkb3dubG9hZHMuDQoJICoNCgkgKiBAcmV0dXJuIHZvaWQNCgkgKiBAc2luY2UgIDUuMC4yDQoJICovDQoJcHVibGljIGZ1bmN0aW9uIGRvd25sb2FkTWVkaWEoKQ0KCXsNCgkJJHRoaXMtPnByb2Nlc3NEb3dubG9hZChmYWxzZSk7DQoJfQ0KDQoJLyoqDQoJICogUHJvY2Vzc2VzIHRoZSBkb3dubG9hZCByZXF1ZXN0Lg0KCSAqDQoJICogQHBhcmFtIGJvb2wgJGRvd25sb2FkIFdoZXRoZXIgdG8gZm9yY2UgZG93bmxvYWQgKHRydWUpIG9yIGRpc3BsYXkgaW5saW5lIChmYWxzZSkuDQoJICoNCgkgKiBAcmV0dXJuIHZvaWQNCgkgKiBAc2luY2UgIDUuMC4yDQoJICovDQoJcHJvdGVjdGVkIGZ1bmN0aW9uIHByb2Nlc3NEb3dubG9hZChib29sICRkb3dubG9hZCkNCgl7DQoJCSRpbnB1dCAgICA9ICR0aGlzLT5hcHAtPmlucHV0Ow0KCQkkZmlsZUd1aWQgPSAkaW5wdXQtPmdldFN0cmluZygnZmlsZScpOw0KDQoJCWlmICgkZmlsZUd1aWQpDQoJCXsNCgkJCSRmaWxlRGV0YWlscyA9ICR0aGlzLT5nZXRGaWxlRGV0YWlscygkZmlsZUd1aWQpOw0KDQoJCQlpZiAoJGZpbGVEZXRhaWxzKQ0KCQkJew0KCQkJCSR0aGlzLT5zZW5kRmlsZSgkZmlsZURldGFpbHMsICRkb3dubG9hZCk7DQoJCQl9DQoJCQllbHNlDQoJCQl7DQoJCQkJJHRoaXMtPmFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ0Rvd25sb2FkIGZhaWxlZCwgeW91IGRvIG5vdCBoYXZlIGFjY2VzcyB0byB0aGlzIGZpbGUhJywgJ2Vycm9yJyk7DQoJCQkJJHRoaXMtPmFwcC0+cmVkaXJlY3QoJ2luZGV4LnBocCcpOw0KCQkJfQ0KCQl9DQoJCWVsc2UNCgkJew0KCQkJJHRoaXMtPmFwcC0+ZW5xdWV1ZU1lc3NhZ2UoJ05vIGZpbGUgc3BlY2lmaWVkLicsICdlcnJvcicpOw0KCQkJJHRoaXMtPmFwcC0+cmVkaXJlY3QoJ2luZGV4LnBocCcpOw0KCQl9DQoJfQ0KDQoJLyoqDQoJICogU2VuZHMgdGhlIGZpbGUgdG8gdGhlIGNsaWVudC4NCgkgKg0KCSAqIEBwYXJhbSBhcnJheSAkZmlsZURldGFpbHMgVGhlIGRldGFpbHMgb2YgdGhlIGZpbGUgdG8gc2VuZC4NCgkgKiBAcGFyYW0gYm9vbCAgJGRvd25sb2FkICAgIFdoZXRoZXIgdG8gZm9yY2UgZG93bmxvYWQgKHRydWUpIG9yIGRpc3BsYXkgaW5saW5lIChmYWxzZSkuDQoJICoNCgkgKiBAcmV0dXJuIHZvaWQNCgkgKiBAc2luY2UgIDUuMC4yDQoJICovDQoJcHJvdGVjdGVkIGZ1bmN0aW9uIHNlbmRGaWxlKGFycmF5ICRmaWxlRGV0YWlscywgYm9vbCAkZG93bmxvYWQpDQoJew0KCQkkZmlsZVBhdGggPSAkZmlsZURldGFpbHNbJ2ZpbGVfcGF0aCddID8/IG51bGw7DQoJCSRmaWxlTmFtZSA9ICRmaWxlRGV0YWlsc1snbmFtZSddID8/IG51bGw7DQoNCgkJaWYgKCRmaWxlUGF0aCAhPT0gbnVsbCAmJiAkZmlsZU5hbWUgIT09IG51bGwgJiYgaXNfZmlsZSgkZmlsZVBhdGgpICYmIGlzX3JlYWRhYmxlKCRmaWxlUGF0aCkpDQoJCXsNCgkJCS8vIENsZWFuIHRoZSBvdXRwdXQgYnVmZmVyDQoJCQlpZiAob2JfZ2V0X2xldmVsKCkpDQoJCQl7DQoJCQkJb2JfZW5kX2NsZWFuKCk7DQoJCQl9DQoNCgkJCS8vIEdldCBhbmQgdmFsaWRhdGUgdGhlIGZpbGUgc2l6ZSBpbiBieXRlcw0KCQkJJGZpbGVTaXplID0gaXNzZXQoJGZpbGVEZXRhaWxzWydzaXplJ10pICYmIGlzX251bWVyaWMoJGZpbGVEZXRhaWxzWydzaXplJ10pICYmICRmaWxlRGV0YWlsc1snc2l6ZSddICE9IDANCgkJCQk/IChpbnQpICRmaWxlRGV0YWlsc1snc2l6ZSddIDogZmlsZXNpemUoJGZpbGVQYXRoKTsNCg0KCQkJLy8gR2V0IGFuZCB2YWxpZGF0ZSB0aGUgTUlNRSB0eXBlDQoJCQkkbWltZVR5cGUgPSAhZW1wdHkoJGZpbGVEZXRhaWxzWydtaW1lJ10pICYmIGlzX3N0cmluZygkZmlsZURldGFpbHNbJ21pbWUnXSkgJiYgdHJpbSgkZmlsZURldGFpbHNbJ21pbWUnXSkgIT09ICcnDQoJCQkJPyB0cmltKCRmaWxlRGV0YWlsc1snbWltZSddKSA6IFN1cGVyX19fZjExZGM3OTBfNzEzZV80NzA2XzlhODVfYTMxOGVkM2FkNTZlX19fUG93ZXI6Om1pbWVUeXBlKCRmaWxlUGF0aCk7DQoNCgkJCSRkaXNwb3NpdGlvbiA9ICRkb3dubG9hZCA/ICdhdHRhY2htZW50JyA6ICdpbmxpbmUnOw0KDQoJCQkvLyBTZXQgaGVhZGVycw0KCQkJJHRoaXMtPmFwcC0+c2V0SGVhZGVyKCdDb250ZW50LURlc2NyaXB0aW9uJywgJ0ZpbGUgVHJhbnNmZXInLCB0cnVlKTsNCgkJCSR0aGlzLT5hcHAtPnNldEhlYWRlcignQ29udGVudC1UeXBlJywgJG1pbWVUeXBlLCB0cnVlKTsNCgkJCSR0aGlzLT5hcHAtPnNldEhlYWRlcignQ29udGVudC1MZW5ndGgnLCAoc3RyaW5nKSAkZmlsZVNpemUsIHRydWUpOw0KCQkJJHRoaXMtPmFwcC0+c2V0SGVhZGVyKCdDb250ZW50LURpc3Bvc2l0aW9uJywgJGRpc3Bvc2l0aW9uIC4gJzsgZmlsZW5hbWU9IicgLiBiYXNlbmFtZSgkZmlsZU5hbWUpIC4gJyInLCB0cnVlKTsNCgkJCSR0aGlzLT5hcHAtPnNldEhlYWRlcignUHJhZ21hJywgJ3B1YmxpYycsIHRydWUpOw0KCQkJJHRoaXMtPmFwcC0+c2V0SGVhZGVyKCdFeHBpcmVzJywgJzAnLCB0cnVlKTsNCgkJCSR0aGlzLT5hcHAtPnNldEhlYWRlcignQ2FjaGUtQ29udHJvbCcsICdtdXN0LXJldmFsaWRhdGUsIHBvc3QtY2hlY2s9MCwgcHJlLWNoZWNrPTAnLCB0cnVlKTsNCg0KCQkJLy8gU2VuZCBoZWFkZXJzDQoJCQkkdGhpcy0+YXBwLT5zZW5kSGVhZGVycygpOw0KDQoJCQkvLyBPdXRwdXQgdGhlIGZpbGUNCgkJCXJlYWRmaWxlKCRmaWxlUGF0aCk7DQoNCgkJCS8vIENsb3NlIHRoZSBhcHBsaWNhdGlvbg0KCQkJJHRoaXMtPmFwcC0+Y2xvc2UoKTsNCgkJfSBlbHNlIHsNCgkJCSR0aGlzLT5hcHAtPmVucXVldWVNZXNzYWdlKCdGaWxlIG5vdCBmb3VuZC4nLCAnZXJyb3InKTsNCgkJCSR0aGlzLT5hcHAtPnJlZGlyZWN0KCdpbmRleC5waHAnKTsNCgkJfQ0KCX0NCg0KCS8qKg0KCSAqIFJldHJpZXZlcyBmaWxlIGRldGFpbHMgYmFzZWQgb24gR1VJRC4NCgkgKg0KCSAqIEBwYXJhbSBzdHJpbmcgJGd1aWQgVGhlIEdVSUQgb2YgdGhlIGZpbGUuDQoJICoNCgkgKiBAcmV0dXJuIGFycmF5fG51bGwgVGhlIGZpbGUgZGV0YWlscyBvciBudWxsIGlmIG5vdCBmb3VuZCBvciBpbmFjY2Vzc2libGUuDQoJICogQHNpbmNlICA1LjAuMg0KCSAqLw0KCXByb3RlY3RlZCBmdW5jdGlvbiBnZXRGaWxlRGV0YWlscyhzdHJpbmcgJGd1aWQpOiA/YXJyYXkNCgl7DQoJCXRyeSB7DQoJCQlyZXR1cm4gU3VwZXJfX184ODRlY2E3OF8yODFmXzRlYWJfYjk2Ml9kOTdlMzU1YWYxNmRfX19Qb3dlcjo6XygnRmlsZS5NYW5hZ2VyJyktPmRvd25sb2FkKCRndWlkKTsNCgkJfSBjYXRjaCAoXEV4Y2VwdGlvbiAkZSkgew0KCQkJLy8gTG9nIGV4Y2VwdGlvbiAoYXNzdW1lZCB0aGF0IGEgbG9nZ2VyIGlzIGF2YWlsYWJsZSkNCgkJCS8vICR0aGlzLT5sb2dnZXItPmVycm9yKCdFcnJvciByZXRyaWV2aW5nIGZpbGUgZGV0YWlsczogJyAuICRlLT5nZXRNZXNzYWdlKCkpOw0KDQoJCQkvLyBEaXNwbGF5IGEgZ2VuZXJpYyBlcnJvciBtZXNzYWdlDQoJCQkkdGhpcy0+YXBwLT5lbnF1ZXVlTWVzc2FnZSgnQW4gZXJyb3Igb2NjdXJyZWQgd2hpbGUgcmV0cmlldmluZyB0aGUgZmlsZS4nLCAnZXJyb3InKTsNCgkJfQ0KDQoJCXJldHVybiBudWxsOw0KCX0NCn0=', '', 1, '', 'dynamicDownloadController', '', '', '', 'Dynamic Download Controller', 2, '', '', '', 1, '2018-10-30 16:20:34', '2024-09-18 23:34:13', 9, '', 111),
 (338, 'IyMgQ29udHJpYnV0b3JzDQpUaGlzIHByb2plY3QgZXhpc3RzIHRoYW5rcyB0byBhbGwgdGhlIHBlb3BsZSB3aG8gY29udHJpYnV0ZSB0byB0aGUgW0pvb21sYSBDb21wb25lbnQgQnVpbGRlciBQcm9qZWN0XShodHRwczovL2dpdGh1Yi5jb20vdmRtLWlvL0pvb21sYS1Db21wb25lbnQtQnVpbGRlcikuDQoNClshW0NvbnRyaWJ1dG9yc10oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL2NvbnRyaWJ1dG9ycy5zdmc/d2lkdGg9ODkwJmJ1dHRvbj1mYWxzZSldKGh0dHBzOi8vZ2l0aHViLmNvbS92ZG0taW8vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL2dyYXBocy9jb250cmlidXRvcnMpDQoNCiMjIyBCYWNrZXJzDQpUaGFuayB5b3UgdG8gYWxsIG91ciBiYWNrZXJzISDwn5mPIFtbQmVjb21lIGEgYmFja2VyXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIjYmFja2VyKV0NCg0KWyFbT3VyIEJhY2tlcnMgb24gb3BlbmNvbGxlY3RpdmVdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9iYWNrZXJzLnN2Zz93aWR0aD04OTApXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIjYmFja2VycykNCg0KIyMjIFNwb25zb3JzDQpTdXBwb3J0IHRoaXMgcHJvamVjdCBieSBiZWNvbWluZyBhIHNwb25zb3IuIFlvdXIgbG9nbyB3aWxsIHNob3cgdXAgaGVyZSB3aXRoIGEgbGluayB0byB5b3VyIHdlYnNpdGUuIFtbQmVjb21lIGEgc3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyI3Nwb25zb3IpXQ0KDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8wL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8wL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8zL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8zL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci80L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci80L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci81L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci81L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci82L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci82L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci83L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci83L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci84L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci84L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci85L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci85L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMC9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTAvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzExL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMS93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTIvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzEyL3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xMy9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTMvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE0L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNC93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTUvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE1L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNi9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTYvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE3L2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xNy93ZWJzaXRlKQ0KWyFbU3BvbnNvcl0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTgvYXZhdGFyLnN2ZyldKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzE4L3dlYnNpdGUpDQpbIVtTcG9uc29yXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8xOS9hdmF0YXIuc3ZnKV0oaHR0cHM6Ly9vcGVuY29sbGVjdGl2ZS5jb20vSm9vbWxhLUNvbXBvbmVudC1CdWlsZGVyL3Nwb25zb3IvMTkvd2Vic2l0ZSkNClshW1Nwb25zb3JdKGh0dHBzOi8vb3BlbmNvbGxlY3RpdmUuY29tL0pvb21sYS1Db21wb25lbnQtQnVpbGRlci9zcG9uc29yLzIwL2F2YXRhci5zdmcpXShodHRwczovL29wZW5jb2xsZWN0aXZlLmNvbS9Kb29tbGEtQ29tcG9uZW50LUJ1aWxkZXIvc3BvbnNvci8yMC93ZWJzaXRlKQ==', '', 1, '', 'readMEcontributors', '', '', '', 'README - Contributors 2 JCB', 2, '', '', '', 1, '2020-11-17 17:16:23', '2020-11-17 17:26:34', 3, '', 182),
 (360, 'CQkvLyBTZXQgdGhlIEdVSUQgaWYgZW1wdHkgb3Igbm90IHZhbGlkDQoJCWlmIChlbXB0eSgkZGF0YVsnZ3VpZCddKSAmJiAkZGF0YVsnaWQnXSA+IDApDQoJCXsNCgkJCS8vIGdldCB0aGUgZXhpc3Rpbmcgb25lDQoJCQkkZGF0YVsnZ3VpZCddID0gKHN0cmluZykgU3VwZXJfX19kYjg3YzMzOV81YmI2XzQyOTFfYTdlZl8yYzQ4ZWExYjA2YmNfX19Qb3dlcjo6dmFyKCdbW1t2aWV3XV1dJywgJGRhdGFbJ2lkJ10sICdpZCcsICdndWlkJyk7DQoJCX0NCg0KCQkvLyBTZXQgdGhlIEdVSUQgaWYgZW1wdHkgb3Igbm90IHZhbGlkDQoJCXdoaWxlICghU3VwZXJfX185YzUxM2JhZl9iMjc5XzQzZmRfYWUyOV9hNTg1YzhjYmM0ZjBfX19Qb3dlcjo6dmFsaWQoJGRhdGFbJ2d1aWQnXSwgIltbW3ZpZXddXV0iLCAkZGF0YVsnaWQnXSkpDQoJCXsNCgkJCS8vIG11c3QgYWx3YXlzIGJlIHNldA0KCQkJJGRhdGFbJ2d1aWQnXSA9IChzdHJpbmcpIFN1cGVyX19fOWM1MTNiYWZfYjI3OV80M2ZkX2FlMjlfYTU4NWM4Y2JjNGYwX19fUG93ZXI6OmdldCgpOw0KCQl9', '', 1, 1646, 'saveGUIDPower', '6__ebdedf217dd264bb88f9418ba0092c96', '', '', 'save GUID (Power)', 2, 1652, '', '', 1, '2023-06-29 16:14:44', '2023-06-29 16:15:32', 2, '', 103),
@@ -2168,7 +2168,7 @@ INSERT INTO `#__componentbuilder_custom_code` (`id`, `code`, `component`, `comme
 (387, 'CQkJLy8gQ2hlY2sgdGhhdCB0aGUgUEhQIGNvbmZpZ3VyYXRpb25zIGFyZSBzdWZmaWNpZW50IA0KCQkJaWYgKCR0aGlzLT5jbGFzc0V4aXN0cyhTdXBlcl9fXzRiMmQ2ZjI4XzM0NmVfNDZlY19iZjI0X2Q0NzAzMTljY2EyZF9fX1Bvd2VyOjpjbGFzcykpDQoJCQl7DQoJCQkJKG5ldyBTdXBlcl9fXzRiMmQ2ZjI4XzM0NmVfNDZlY19iZjI0X2Q0NzAzMTljY2EyZF9fX1Bvd2VyKCkpLT5ydW4oKTsNCgkJCX0=', '', 1, '', 'phpConfigurationCheckCall', '', '', '', 'php Configuration Check (call)', 2, '', '', '', 1, '2024-04-20 13:19:08', '2024-07-27 15:24:34', 6, '', 209),
 (388, 'CQkJLy8gQ2hlY2sgdGhhdCB0aGUgZGF0YWJhc2UgaXMgdXAtdG8gZGF0ZQ0KCQkJaWYgKCR0aGlzLT5jbGFzc0V4aXN0cyhTdXBlcl9fXzcwOWQ3Mjk0XzlhNDNfNDZlMl9iNjRlX2QxNmExNmYwZWFiMV9fX1Bvd2VyOjpjbGFzcykpDQoJCQl7DQoJCQkJKG5ldyBTdXBlcl9fXzcwOWQ3Mjk0XzlhNDNfNDZlMl9iNjRlX2QxNmExNmYwZWFiMV9fX1Bvd2VyKCkpLT5ydW4oKTsNCgkJCX0=', '', 1, '', 'databaseSchemaCheckCall', '', '', '', 'Database Schema Check (call)', 2, '', '', '', 1, '2024-04-20 13:21:02', '2024-09-15 23:56:25', 13, '', 209),
 (396, 'CQkvLyBTdGFydCB0aGUgb3B0aW9ucyBhcnJheQ0KCQkkb3B0aW9ucyA9IFtdOw0KCQkvLyBHZXQgdGhlIGV4dGVuc2lvbnMgbGlzdC4NCgkJJGV4dGVuc2lvbkxpc3QgPSBTdXBlcl9fX2YxMWRjNzkwXzcxM2VfNDcwNl85YTg1X2EzMThlZDNhZDU2ZV9fX1Bvd2VyOjpnZXRGaWxlRXh0ZW5zaW9ucygnW1tbYXJnMF1dXScsIHRydWUpOw0KCQlpZiAoU3VwZXJfX18wYTU5YzY1Y185ZGFmXzRiYzlfYmFmNF9lMDYzZmY5ZTZhOGFfX19Qb3dlcjo6Y2hlY2soJGV4dGVuc2lvbkxpc3QpKQ0KCQl7DQoJCQlmb3JlYWNoKCRleHRlbnNpb25MaXN0IGFzICR0eXBlID0+ICRleHRlbnNpb25zKQ0KCQkJew0KCQkJCWZvcmVhY2goJGV4dGVuc2lvbnMgYXMgJGV4dGVuc2lvbikNCgkJCQl7DQoJCQkJCSRvcHRpb25zW10gPSBIdG1sOjpfKCdzZWxlY3Qub3B0aW9uJywgJGV4dGVuc2lvbiwgJGV4dGVuc2lvbiAuICcgWyAnIC4gJHR5cGUgLiAnIF0nKTsNCgkJCQl9DQoJCQl9DQoJCX0NCgkJcmV0dXJuICRvcHRpb25zOw0K', '', 1, '', 'getFileExtensionsOptions', '', '', '', 'getFileExtensionsOptions', 2, '', '', '', 1, '2020-09-08 01:36:53', '2024-09-15 22:56:42', 3, '', 214),
-(397, 'CQkvKiogQHZhciBKb29tbGFcQ01TXFdlYkFzc2V0XFdlYkFzc2V0TWFuYWdlciAkd2EgKi8NCgkJJHdhID0gJHRoaXMtPmdldERvY3VtZW50KCktPmdldFdlYkFzc2V0TWFuYWdlcigpOw0KDQoJCS8vIHNldCB0aGUgdXJsIGFzIG5lZWRlZA0KCQkkYXBwID0gRmFjdG9yeTo6Z2V0QXBwbGljYXRpb24oKTsNCgkJJHVybCA9ICcnOw0KCQlpZiAoJGFwcC0+aXNDbGllbnQoJ3NpdGUnKSkNCgkJew0KCQkJJHVybCA9IEpvb21sYV9fX2VlY2MxNDNlX2I1Y2ZfNGMzM19iYTRkXzk3ZGExZGY2MTQyMl9fX1Bvd2VyOjpyb290KCk7DQoJCX0NCg0KCQkvLyBnZXQgdGhlIGZvcm0gdG9rZW4NCgkJJHRva2VuID0gSm9vbWxhX19fNWJhMzg1MTNfNWM0Zl80YjBkXzkzNWVfNDllOTg2YTZiY2U4X19fUG93ZXI6OmdldEZvcm1Ub2tlbigpOw0KCQkkZW50aXR5ID0gJHRoaXMtPml0ZW0tPmd1aWQgPz8gMDsNCgkJJHRhcmdldCA9IGJhc2U2NF9lbmNvZGUoJ1tbW3ZpZXddXV0nKTsNCg0KCQkvLyBEZWZpbmUgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIHRoZSB1cGxvYWRlcg0KCQkkdXBsb2FkZXJDb25maWcgPSBbDQoJCQkiZW5kcG9pbnRfdHlwZSIgPT4gInskdXJsfWluZGV4LnBocD9vcHRpb249Y29tX1tbW2NvbXBvbmVudF1dXSZ0YXNrPWFqYXguW1tbYXJnMl1dXSZmb3JtYXQ9anNvbiZyYXc9dHJ1ZSZ7JHRva2VufT0xJnRhcmdldD17JHRhcmdldH0iLA0KCQkJInRhcmdldF9jbGFzcyIgPT4gIltbW2FyZzBdXV0iLA0KCQkJIltbW2FyZzFdXV0iID0+IFsNCgkJCQkiZW5kcG9pbnRfdXBsb2FkIiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmczXV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEmZW50aXR5PXskZW50aXR5fSZ0YXJnZXQ9eyR0YXJnZXR9IiwNCgkJCQkiZW5kcG9pbnRfZGlzcGxheSIgPT4gInskdXJsfWluZGV4LnBocD9vcHRpb249Y29tX1tbW2NvbXBvbmVudF1dXSZ0YXNrPWFqYXguW1tbYXJnNF1dXSZmb3JtYXQ9anNvbiZyYXc9dHJ1ZSZ7JHRva2VufT0xJmVudGl0eT17JGVudGl0eX0mdGFyZ2V0PXskdGFyZ2V0fSIsDQoJCQkJImVuZHBvaW50X2RlbGV0ZSIgPT4gInskdXJsfWluZGV4LnBocD9vcHRpb249Y29tX1tbW2NvbXBvbmVudF1dXSZ0YXNrPWFqYXguW1tbYXJnNV1dXSZmb3JtYXQ9anNvbiZyYXc9dHJ1ZSZ7JHRva2VufT0xIiwNCgkJCV0sDQoJCV07DQoNCgkJLy8gQ29udmVydCB0aGUgUEhQIGFycmF5IHRvIGEgSmF2YVNjcmlwdCBvYmplY3QNCgkJJHVwbG9hZGVyQ29uZmlnSnNvbiA9IGpzb25fZW5jb2RlKCR1cGxvYWRlckNvbmZpZyk7DQoNCgkJLy8gQWRkIHRoZSBpbmxpbmUgc2NyaXB0IHdpdGggdGhlIHVwbG9hZGVyIGNvbmZpZ3VyYXRpb24NCgkJJHdhLT5hZGRJbmxpbmVTY3JpcHQoIg0KCQkJd2luZG93LlZETSA9IHdpbmRvdy5WRE0gfHwge307DQoJCQl3aW5kb3cuVkRNLnVpa2l0ID0gd2luZG93LlZETS51aWtpdCB8fCB7fTsNCgkJCXdpbmRvdy5WRE0udWlraXQuY29uZmlnID0gJHVwbG9hZGVyQ29uZmlnSnNvbjsNCgkJIik7', '', 1, '', 'vdmUploaderConfig', '', '', '', 'vdmUploaderConfig', 2, '', '', '', 1, '2024-09-10 01:01:26', '2024-09-16 18:11:49', 9, '', 215),
+(397, 'CQkvKiogQHZhciBKb29tbGFcQ01TXFdlYkFzc2V0XFdlYkFzc2V0TWFuYWdlciAkd2EgKi8NCgkJJHdhID0gJHRoaXMtPmdldERvY3VtZW50KCktPmdldFdlYkFzc2V0TWFuYWdlcigpOw0KDQoJCS8vIHNldCB0aGUgdXJsIGFzIG5lZWRlZA0KCQkkYXBwID0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoJCSR1cmwgPSAnJzsNCgkJaWYgKCRhcHAtPmlzQ2xpZW50KCdzaXRlJykpDQoJCXsNCgkJCSR1cmwgPSBKb29tbGFfX19lZWNjMTQzZV9iNWNmXzRjMzNfYmE0ZF85N2RhMWRmNjE0MjJfX19Qb3dlcjo6cm9vdCgpOw0KCQl9DQoNCgkJLy8gZ2V0IHRoZSBmb3JtIHRva2VuDQoJCSR0b2tlbiA9IEpvb21sYV9fXzViYTM4NTEzXzVjNGZfNGIwZF85MzVlXzQ5ZTk4NmE2YmNlOF9fX1Bvd2VyOjpnZXRGb3JtVG9rZW4oKTsNCgkJJGVudGl0eSA/Pz0gJHRoaXMtPml0ZW0tPmd1aWQgPz8gMDsNCgkJJHRhcmdldCA/Pz0gYmFzZTY0X2VuY29kZSgnW1tbdmlld11dXScpOw0KDQoJCS8vIERlZmluZSB0aGUgY29uZmlndXJhdGlvbiBmb3IgdGhlIHVwbG9hZGVyDQoJCSR1cGxvYWRlckNvbmZpZyA9IFsNCgkJCSJlbmRwb2ludF90eXBlIiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmcyXV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEmdGFyZ2V0PXskdGFyZ2V0fSIsDQoJCQkidGFyZ2V0X2NsYXNzIiA9PiAiW1tbYXJnMF1dXSIsDQoJCQkiW1tbYXJnMV1dXSIgPT4gWw0KCQkJCSJlbmRwb2ludF91cGxvYWQiID0+ICJ7JHVybH1pbmRleC5waHA/b3B0aW9uPWNvbV9bW1tjb21wb25lbnRdXV0mdGFzaz1hamF4LltbW2FyZzNdXV0mZm9ybWF0PWpzb24mcmF3PXRydWUmeyR0b2tlbn09MSZlbnRpdHk9eyRlbnRpdHl9JnRhcmdldD17JHRhcmdldH0iLA0KCQkJCSJlbmRwb2ludF9kaXNwbGF5IiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmc0XV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEmZW50aXR5PXskZW50aXR5fSZ0YXJnZXQ9eyR0YXJnZXR9IiwNCgkJCQkiZW5kcG9pbnRfZGVsZXRlIiA9PiAieyR1cmx9aW5kZXgucGhwP29wdGlvbj1jb21fW1tbY29tcG9uZW50XV1dJnRhc2s9YWpheC5bW1thcmc1XV1dJmZvcm1hdD1qc29uJnJhdz10cnVlJnskdG9rZW59PTEiLA0KCQkJXSwNCgkJXTsNCg0KCQkvLyBDb252ZXJ0IHRoZSBQSFAgYXJyYXkgdG8gYSBKYXZhU2NyaXB0IG9iamVjdA0KCQkkdXBsb2FkZXJDb25maWdKc29uID0ganNvbl9lbmNvZGUoJHVwbG9hZGVyQ29uZmlnKTsNCg0KCQkvLyBBZGQgdGhlIGlubGluZSBzY3JpcHQgd2l0aCB0aGUgdXBsb2FkZXIgY29uZmlndXJhdGlvbg0KCQkkd2EtPmFkZElubGluZVNjcmlwdCgiDQoJCQl3aW5kb3cuVkRNID0gd2luZG93LlZETSB8fCB7fTsNCgkJCXdpbmRvdy5WRE0udWlraXQgPSB3aW5kb3cuVkRNLnVpa2l0IHx8IHt9Ow0KCQkJd2luZG93LlZETS51aWtpdC5jb25maWcgPSAkdXBsb2FkZXJDb25maWdKc29uOw0KCQkiKTs=', '', 1, '', 'vdmUploaderConfig', '', '', '', 'vdmUploaderConfig', 2, '', '', '', 1, '2024-09-10 01:01:26', '2024-10-08 00:54:26', 12, '', 215),
 (398, 'CQlIdG1sOjpfKCdzY3JpcHQnLCAnbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS91aWtpdC12My9qcy91aWtpdC5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzY3JpcHQnLCAnbWVkaWEvY29tX1tbW2NvbXBvbmVudF1dXS91aWtpdC12My9qcy91aWtpdC1pY29ucy5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzY3JpcHQnLCAnaHR0cHM6Ly9jZG4uanNkZWxpdnIubmV0L2doL3ZkbS1pby91aWtpdEAzLjAuMC9kaXN0L2pzL3ZkbS5taW4uanMnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw0KCQlIdG1sOjpfKCdzdHlsZXNoZWV0JywgJ21lZGlhL2NvbV9bW1tjb21wb25lbnRdXV0vdWlraXQtdjMvY3NzL3Vpa2l0Lm1pbi5jc3MnLCBbJ3ZlcnNpb24nID0+ICdhdXRvJ10pOw==', '', 1, '', 'addUikitThreeToAdminViews', '', '', '', 'addUikitThreeToAdminViews', 2, '', '', '', 1, '2024-09-10 01:03:38', '2024-09-16 18:12:10', 3, '', 216),
 (400, 'CQkJLy8gR2V0IEFwcGxpY2F0aW9uIG9iamVjdA0KCQkJJHRoaXMtPmFwcCA/Pz0gSm9vbWxhX19fMzk0MDMwNjJfODRmYl80NmUwX2JhYzRfMDAyM2Y3NjZlODI3X19fUG93ZXI6OmdldEFwcGxpY2F0aW9uKCk7DQoJCQkkdGhpcy0+YXBwLT5lbnF1ZXVlTWVzc2FnZSgnPGgzPlVubG9jayB0aGUgUG93ZXIgb2YgSm9vbWxhISBEZXZlbG9wbWVudDwvaDM+PHA+Q3VyaW91cyBhYm91dCBob3cgdGhpcyA8Yj5bW1thcmcwXV1dPC9iPiBjb21wb25lbnQgd2FzIGJ1aWx0PyBEaXNjb3ZlciB0aGUgcG93ZXJmdWwgSm9vbWxhISBDb21wb25lbnQgQnVpbGRlciAoPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEhIENvbXBvbmVudCBCdWlsZGVyIj5KQ0I8L2E+KSwgYSB0b29sIHRoYXQgc2ltcGxpZmllcyBhbmQgZW5oYW5jZXMgY29tcG9uZW50IGRldmVsb3BtZW50LiBKb2luIHVzIG9uIDxhIGhyZWY9Imh0dHBzOi8vZ2l0LnZkbS5kZXYvam9vbWxhIiB0YXJnZXQ9Il9ibGFuayIgdGl0bGU9Ikpvb21sYSEgQ29tcG9uZW50IEJ1aWxkZXIiPkdJVkVEPC9hPiB0byBleHBsb3JlIG1vcmUgYW5kIHNlZSBob3cgeW91IGNhbiBjcmVhdGUgeW91ciBvd24gY3VzdG9tIGNvbXBvbmVudHMuIFRoZSBmdXR1cmUgb2YgPGEgaHJlZj0iaHR0cDovL3ZkbS5iei9jb21wb25lbnQtYnVpbGRlciIgdGFyZ2V0PSJfYmxhbmsiIHRpdGxlPSJKb29tbGEgQ29tcG9uZW50IEJ1aWxkZXIiPkpvb21sYSEgRGV2ZWxvcG1lbnQ8L2E+IHN0YXJ0cyBoZXJlITwvcD4nLCAnSW5mbycpOw0K', '', 1, '', 'unlockThePowerOfJoomlaDevelopment', '', '', '', 'Unlock the Power of Joomla! Development', 2, '', '', '', 1, '2024-09-16 00:00:42', '2024-09-16 16:17:20', 5, '', 218);
 
@@ -2548,25 +2548,25 @@ INSERT INTO `#__componentbuilder_validation_rule` (`id`, `inherit`, `name`, `php
 --
 
 INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`, `add_javascript_view_footer`, `add_javascript_views_footer`, `css_view`, `css_views`, `datadefault`, `datadefault_other`, `datalenght`, `datalenght_other`, `datatype`, `indexes`, `javascript_view_footer`, `javascript_views_footer`, `name`, `null_switch`, `store`, `fieldtype`, `xml`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `guid`, `on_get_model_field`, `on_save_model_field`, `initiator_on_get_model`, `initiator_on_save_model`, `params`) VALUES
-(23, '', '', '', '', '', '', '', '', 64, '', 'CHAR', 2, '', '', 'Alias', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"alias\\\"\\n\\tlabel=\\\"Alias\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\thint=\\\"Auto-generated from name\\\"\\n\\/>\"', 1, '2015-04-09 13:46:04', '2023-06-27 23:46:54', 3, '', 216, '335866ce-b81b-4329-901d-c20254135c9c', '', '', '', '', ''),
+(23, '', '', '', '', '', '', '', '', 64, '', 'CHAR', 2, '', '', 'Alias', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"alias\\\"\\n\\tlabel=\\\"Alias\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\thint=\\\"Auto-generated from name\\\"\\n\\/>\"', 1, '2015-04-09 13:46:04', '2024-10-10 22:13:47', 4, '', 216, '335866ce-b81b-4329-901d-c20254135c9c', '', '', '', '', ''),
 (84, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Description (full width)', 'NULL', '', 25, '\"<field\\n\\ttype=\\\"textarea\\\"\\n\\tname=\\\"description\\\"\\n\\tlabel=\\\"Description\\\"\\n\\trows=\\\"11\\\"\\n\\tcols=\\\"10\\\"\\n\\tdescription=\\\"Add Description Here\\\"\\n\\tclass=\\\"text_area span12\\\"\\n\\tfilter=\\\"HTML\\\"\\n\\thint=\\\"Add Description Here\\\"\\n\\/>\"', 1, '2015-03-19 18:20:49', '2024-03-06 15:53:48', 5, '', 265, '749a9917-90c3-49c4-9e72-aa33b0683a87', '', '', '', '', ''),
 (100, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Email (required)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"email\\\"\\n\\tlabel=\\\"Email\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Email\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tvalidate=\\\"email\\\"\\n\\tmessage=\\\"Error! Please add email address here.\\\"\\n\\thint=\\\"demo@example.com\\\"\\n\\/>\"', 1, '2015-05-05 23:44:32', '2024-09-15 22:24:59', 5, '', 285, '10c1eccb-b3c3-4325-a056-45a72d116fd8', '', '', '', '', ''),
 (158, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Image', 'NOT NULL', '', 12, '\"<field\\n\\ttype=\\\"media\\\"\\n\\tname=\\\"image\\\"\\n\\tlabel=\\\"Image\\\"\\n\\/>\"', 1, '2015-04-29 14:00:56', '2020-06-07 02:17:46', 2, '', 45, '0d6970af-b361-4f65-84f6-0eb0c5f09bad', '', '', '', '', ''),
 (196, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone (required)', 'NOT NULL', '', 23, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"mobile_phone\\\"\\n\\tlabel=\\\"Mobile Phone\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Mobile Phone Number\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tvalidated=\\\"tel\\\"\\n\\tmessage=\\\"Error! Please add mobile phone number here.\\\"\\n\\thint=\\\"Mobile Phone Here\\\"\\n\\/>\"', 1, '2015-04-07 22:12:58', '2024-09-16 23:27:41', 5, '', 7, '65933a19-243a-48b2-aae9-34e2da710051', '', '', '', '', ''),
-(199, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (Key - Required)', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"false\\\"\\n\\tdisabled=\\\"false\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2015-03-19 17:30:59', '2023-06-19 22:38:40', 10, '', 4, '5d3d34dd-4876-4c6a-86ab-b4e162f22c08', '', '', '', '', ''),
+(199, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (Key - Required)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"false\\\"\\n\\tdisabled=\\\"false\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2015-03-19 17:30:59', '2024-10-10 22:13:01', 11, '', 4, '5d3d34dd-4876-4c6a-86ab-b4e162f22c08', '', '', '', '', ''),
 (203, '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', 9, '\"<field\\n\\ttype=\\\"hidden\\\"\\n\\tname=\\\"not_required\\\"\\n\\tdefault=\\\"\\u4e00_\\u4e00\\\"\\n\\/>\"', 1, '2015-05-08 16:19:16', '2023-09-27 07:57:19', 16, '', 19, 'da5e6901-6958-40e5-a4f5-6822d6fe57ac', '', '', '', '', ''),
 (280, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website (no required)', 'NOT NULL', '', 27, '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"website\\\"\\n\\tlabel=\\\"Website\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter website address\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\tmessage=\\\"Error! Please add website here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\/>\"', 1, '2015-04-08 00:36:16', '2024-09-16 23:30:59', 3, '', 105, '6c3a6983-d1bf-4e5e-9e99-deea00b0cefd', '', '', '', '', ''),
 (324, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'URL', 'NOT NULL', '', 27, '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"url\\\"\\n\\tlabel=\\\"URL\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter url\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\tmessage=\\\"Error! Please add url here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\/>\"', 1, '2015-05-19 16:08:22', '2022-06-18 10:23:24', 4, '', 378, 'd29d6854-bb4a-4fa2-83a1-5a1b9c9a0eaf', '', '', '', '', ''),
-(599, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Groups (multi)', 'NOT NULL', 1, 29, '\"<field\\n\\ttype=\\\"usergrouplist\\\"\\n\\tname=\\\"groups\\\"\\n\\tlabel=\\\"Group\\/s\\\"\\n\\tdescription=\\\"Select a group\\/s\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\trequired=\\\"true\\\"\\n\\tmultiple=\\\"true\\\"\\n\\/>\"', 1, '2015-07-13 23:10:19', '2024-06-05 11:19:28', 8, '', 50, '59a0cad6-26cc-43b6-8af8-2242eb595d76', '', '', '', '', ''),
+(599, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Groups (multi)', 'NULL', 1, 29, '\"<field\\n\\ttype=\\\"usergrouplist\\\"\\n\\tname=\\\"groups\\\"\\n\\tlabel=\\\"Group\\/s\\\"\\n\\tdescription=\\\"Select a group\\/s\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\trequired=\\\"true\\\"\\n\\tmultiple=\\\"true\\\"\\n\\/>\"', 1, '2015-07-13 23:10:19', '2024-10-10 22:05:08', 9, '', 50, '59a0cad6-26cc-43b6-8af8-2242eb595d76', '', '', '', '', ''),
 (682, '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NULL', '', 17, '\"<field\\n\\ttype=\\\"radio\\\"\\n\\tname=\\\"add\\\"\\n\\tlabel=\\\"Add More\\\"\\n\\tdescription=\\\"\\\"\\n\\tclass=\\\"btn-group btn-group-yesno\\\"\\n\\toption=\\\"1|Yes,0|No\\\"\\n\\tdefault=\\\"0\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2015-08-05 01:18:20', '2024-09-07 02:20:13', 8, '', 196, 'a66389aa-2323-4f44-8c23-ff44969639be', '', '', '', '', ''),
-(691, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Email (not required)', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"email\\\"\\n\\tlabel=\\\"Email<br><small>not required<\\/small>\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Email\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add email address here.\\\"\\n\\thint=\\\"demo@example.com\\\"\\n\\/>\"', 1, '2015-08-16 17:21:15', '2019-11-20 11:42:55', 3, '', 285, '976f7e2d-68e3-497e-b4d1-6326d5b95078', '', '', '', '', ''),
+(691, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Email (not required)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"email\\\"\\n\\tlabel=\\\"Email<br><small>not required<\\/small>\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter Email\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"false\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add email address here.\\\"\\n\\thint=\\\"demo@example.com\\\"\\n\\/>\"', 1, '2015-08-16 17:21:15', '2024-10-10 22:14:45', 4, '', 285, '976f7e2d-68e3-497e-b4d1-6326d5b95078', '', '', '', '', ''),
 (1011, '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth (required)', 'NOT NULL', '', 1, '\"<field\\n\\ttype=\\\"calendar\\\"\\n\\tname=\\\"dateofbirth\\\"\\n\\tlabel=\\\"Date of Birth\\\"\\n\\tdefault=\\\"1970-01-01\\\"\\n\\tdescription=\\\"Your date of birth\\\"\\n\\tformat=\\\"%Y-%m-%d\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\trequired=\\\"true\\\"\\n\\ttodaybutton=\\\"false\\\"\\n\\tminyear=\\\"-120\\\"\\n\\tmaxyear=\\\"-1\\\"\\n\\/>\"', 1, '2015-12-07 01:47:32', '2024-09-16 23:29:15', 6, '', 649, 'cb2bdf20-8800-407b-a4f6-250152a0bdfb', '', '', '', '', ''),
 (1160, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', '', '', '', 'Mobile Phone (not-required)', 'NOT NULL', '', 23, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"mobile_phone\\\"\\n\\tlabel=\\\"Mobile Phone\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdefault=\\\"\\\"\\n\\tdescription=\\\"Enter Mobile Phone Number\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tvalidated=\\\"tel\\\"\\n\\tmessage=\\\"Error! Please add mobile phone number here.\\\"\\n\\thint=\\\"Mobile Phone Here\\\"\\n\\/>\"', 1, '2016-03-28 14:01:08', '2024-09-16 23:28:15', 2, '', 7, 'f40974bd-a946-4bc4-9be1-fedec2d09c24', '', '', '', '', ''),
 (2395, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Password', 'NULL', '', 16, '\"<field\\n\\ttype=\\\"password\\\"\\n\\tname=\\\"password\\\"\\n\\tlabel=\\\"Password\\\"\\n\\tsize=\\\"50\\\"\\n\\tdescription=\\\"Enter the password for the user.\\\"\\n\\tmessage=\\\"Error! Please add password here.\\\"\\n\\tclass=\\\"validate-password-strength\\\"\\n\\tvalidate=\\\"password\\\"\\n\\trules=\\\"true\\\"\\n\\tfilter=\\\"raw\\\"\\n\\tautocomplete=\\\"off\\\"\\n\\tstrengthmeter=\\\"true\\\"\\n\\tforce=\\\"on\\\"\\n\\/>\"', 1, '2018-09-15 22:15:07', '2024-09-15 22:30:49', 7, '', 884, 'b9097198-705f-4a6b-bd10-676d55cd6517', '', '', '', '', ''),
 (2396, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Confirm Password', 'NOT NULL', '', 16, '\"<field\\n\\ttype=\\\"password\\\"\\n\\tname=\\\"password_check\\\"\\n\\tlabel=\\\"Confirm Password\\\"\\n\\tsize=\\\"50\\\"\\n\\tdescription=\\\"Confirm the member\'s password.\\\"\\n\\tmessage=\\\"Error! The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tvalidate=\\\"equals\\\"\\n\\tfield=\\\"password\\\"\\n\\tfilter=\\\"raw\\\"\\n\\tautocomplete=\\\"off\\\"\\n\\/>\"', 1, '2018-09-15 22:18:25', '2018-09-15 23:28:27', 6, '', 884, 'cf1b5d92-eae9-4f52-8745-11fcbbed977c', '', '', '', '', ''),
-(2657, '', '', '', '', '', '', '', '', 'Other', 36, 'VARCHAR', 2, '', '', 'GUID', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"guid\\\"\\n\\tlabel=\\\"GUID\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"40\\\"\\n\\tdescription=\\\"Globally Unique Identifier\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"true\\\"\\n\\tfilter=\\\"CMD\\\"\\n\\tvalidate=\\\"guid\\\"\\n\\thint=\\\"Auto Generated\\\"\\n\\/>\"', 1, '2019-10-10 23:08:59', '2024-09-15 23:03:52', 8, '', 960, '5aa57bbe-7b19-4db9-915c-561863458d2b', '', '', '', '', ''),
+(2657, '', '', '', '', '', '', '', '', 'Other', 36, 'VARCHAR', 2, '', '', 'GUID', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"guid\\\"\\n\\tlabel=\\\"GUID\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"40\\\"\\n\\tdescription=\\\"Globally Unique Identifier\\\"\\n\\tclass=\\\"text_area\\\"\\n\\treadonly=\\\"true\\\"\\n\\tfilter=\\\"CMD\\\"\\n\\tvalidate=\\\"guid\\\"\\n\\thint=\\\"Auto Generated\\\"\\n\\/>\"', 1, '2019-10-10 23:08:59', '2024-10-10 22:16:19', 9, '', 960, '5aa57bbe-7b19-4db9-915c-561863458d2b', '', '', '', '', ''),
 (2678, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', 2, '', '', 'Username (required)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"username\\\"\\n\\tlabel=\\\"Username\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter the username.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add the username here.\\\"\\n\\/>\"', 1, '2019-11-17 01:36:06', '2024-09-15 22:24:34', 3, '', 663, 'b7edbefd-d8ee-4765-9a09-ab1922e70e68', '', '', '', '', ''),
-(2941, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (not-required)', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2021-08-05 09:08:56', '2024-09-16 23:13:56', 2, '', 4, '2707db98-28f2-485b-9344-8287427c00ab', '', '', '', '', ''),
+(2941, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Name (not-required)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"name\\\"\\n\\tlabel=\\\"Name\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter Name Here\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\tmessage=\\\"Error! Please add name here.\\\"\\n\\thint=\\\"Name Here\\\"\\n\\/>\"', 1, '2021-08-05 09:08:56', '2024-10-10 22:07:21', 3, '', 4, '2707db98-28f2-485b-9344-8287427c00ab', '', '', '', '', ''),
 (3044, '', '', '', '', '', '', '', '', '', '', 'TEXT', '', '', '', 'Redirects', 'NOT NULL', '', 35, '\"<field\\n\\ttype=\\\"subform\\\"\\n\\tname=\\\"redirect\\\"\\n\\tlabel=\\\"Redirects\\\"\\n\\tlayout=\\\"joomla.form.field.subform.repeatable\\\"\\n\\tmultiple=\\\"true\\\"\\n\\tbuttons=\\\"add,remove,move\\\"\\n\\tfields=\\\"599,324\\\"\\n\\tdescription=\\\"Setup the redirects per group\\/s\\\"\\n\\ticon=\\\"list\\\"\\n\\tmax=\\\"10\\\"\\n\\tmin=\\\"1\\\"\\n\\/>\"', 1, '2022-06-18 10:25:59', '2024-06-05 11:13:57', 3, '', 1025, '12035b51-753b-4e3f-9f41-cde3a6046286', '', '', '', '', ''),
 (3049, '', '', '', '', '', '', '', '', 11, '', 'INT', '', '', '', 'Margin Left', 'NOT NULL', '', 15, '\"<field\\n\\ttype=\\\"number\\\"\\n\\tname=\\\"margin_left\\\"\\n\\tlabel=\\\"Margin Left\\\"\\n\\tdefault=\\\"80\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tmin=\\\"40\\\"\\n\\tmax=\\\"140\\\"\\n\\tstep=\\\"5\\\"\\n\\tvalidate=\\\"number\\\"\\n\\/>\"', 1, '2022-09-21 04:45:28', '2022-10-14 15:17:39', 4, '', 1026, '12ecc6cc-9195-4633-8ecd-27ecc0643bd4', '', '', '', '', ''),
 (3050, '', '', '', '', '', '', '', '', 11, '', 'INT', '', '', '', 'Margin Right', 'NOT NULL', '', 15, '\"<field\\n\\ttype=\\\"number\\\"\\n\\tname=\\\"margin_right\\\"\\n\\tlabel=\\\"Margin Right\\\"\\n\\tdefault=\\\"50\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tmin=\\\"20\\\"\\n\\tmax=\\\"100\\\"\\n\\tstep=\\\"5\\\"\\n\\tvalidate=\\\"number\\\"\\n\\/>\"', 1, '2022-09-21 04:46:17', '2022-10-14 15:17:42', 4, '', 1026, '3e72e2ab-0731-46f1-83ac-8bffddcd5634', '', '', '', '', ''),
@@ -2576,12 +2576,12 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (3054, '', '', '', '', '', '', '', '', 11, '', 'INT', '', '', '', 'Footer Height', 'NOT NULL', '', 15, '\"<field\\n\\ttype=\\\"number\\\"\\n\\tname=\\\"footer_height\\\"\\n\\tlabel=\\\"Footer Height\\\"\\n\\tdefault=\\\"24\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tmin=\\\"10\\\"\\n\\tmax=\\\"80\\\"\\n\\tstep=\\\"1\\\"\\n\\tvalidate=\\\"number\\\"\\n\\/>\"', 1, '2022-09-21 04:50:26', '2022-10-14 15:17:56', 3, '', 1026, 'fb71c5cc-65d9-4389-8599-b94f4eecc97c', '', '', '', '', ''),
 (3055, '', '', '', '', '', '', '', '', 11, '', 'INT', '', '', '', 'Min Years', 'NOT NULL', '', 15, '\"<field\\n\\ttype=\\\"number\\\"\\n\\tname=\\\"min_years\\\"\\n\\tlabel=\\\"Min Years\\\"\\n\\tdefault=\\\"3\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tmin=\\\"1\\\"\\n\\tmax=\\\"10\\\"\\n\\tstep=\\\"1\\\"\\n\\tvalidate=\\\"number\\\"\\n\\/>\"', 1, '2022-09-21 04:54:35', '2022-10-14 15:17:59', 2, '', 1026, '44a3a4aa-f601-4765-b656-2f0a01dd6fd9', '', '', '', '', ''),
 (3056, '', '', '', '', '', '', '', '', 11, '', 'INT', '', '', '', 'Max Years', 'NOT NULL', '', 15, '\"<field\\n\\ttype=\\\"number\\\"\\n\\tname=\\\"max_years\\\"\\n\\tlabel=\\\"Max Years\\\"\\n\\tdefault=\\\"5\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tmin=\\\"1\\\"\\n\\tmax=\\\"20\\\"\\n\\tstep=\\\"1\\\"\\n\\tvalidate=\\\"number\\\"\\n\\/>\"', 1, '2022-09-21 04:55:04', '2022-10-14 15:18:03', 4, '', 1026, '9f5ddbec-3f1c-4af9-8d33-a158bcaaf453', '', '', '', '', ''),
-(3057, '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Version Name', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"version\\\"\\n\\tlabel=\\\"Version\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdefault=\\\"1.0.0\\\"\\n\\tdescription=\\\"Name\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"CMD\\\"\\n\\tmessage=\\\"Error! Please add version here.\\\"\\n\\thint=\\\"1.0.0\\\"\\n\\/>\"', 1, '2022-09-21 04:57:05', '2022-09-21 05:22:43', 4, '', 155, 'f3e44dab-059a-434e-98c5-9d9def389295', '', '', '', '', ''),
+(3057, '', '', '', '', '', '', '', '', 64, '', 'CHAR', '', '', '', 'Version Name', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"version\\\"\\n\\tlabel=\\\"Version\\\"\\n\\tsize=\\\"40\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdefault=\\\"1.0.0\\\"\\n\\tdescription=\\\"Name\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"CMD\\\"\\n\\tmessage=\\\"Error! Please add version here.\\\"\\n\\thint=\\\"1.0.0\\\"\\n\\/>\"', 1, '2022-09-21 04:57:05', '2024-10-10 22:04:14', 5, '', 155, 'f3e44dab-059a-434e-98c5-9d9def389295', '', '', '', '', ''),
 (3058, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'Default Text Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"text_color\\\"\\n\\tdefault=\\\"#ffffff\\\"\\n\\tlabel=\\\"Default Text Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 04:59:12', '2023-08-11 06:51:42', 4, '', 1027, '7414d14b-b802-4ac2-9090-218cdb32156c', '', '', '', '', ''),
 (3059, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'End of Life Background Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"end_of_life_color\\\"\\n\\tdefault=\\\"#f44321\\\"\\n\\tlabel=\\\"End of Life Background Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:09:27', '2023-08-11 06:50:52', 3, '', 1027, 'f83befac-e15e-421c-83a0-c17e99492b79', '', '', '', '', ''),
 (3060, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'End of Life Text Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"end_of_life_text_color\\\"\\n\\tdefault=\\\"#ffffff\\\"\\n\\tlabel=\\\"End of Life Text Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:10:43', '2023-08-11 06:50:43', 3, '', 1027, '8097f524-48e6-470a-aa42-e4383d3019fa', '', '', '', '', ''),
 (3061, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'Future Background Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"future_color\\\"\\n\\tdefault=\\\"#5091cd\\\"\\n\\tlabel=\\\"Future Background Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:11:25', '2023-08-11 06:46:06', 3, '', 1027, '8f485452-b062-4ec9-9fa5-0182d04d8d7c', '', '', '', '', ''),
-(3062, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'State', 'NOT NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"state\\\"\\n\\tlabel=\\\"State\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"WORD\\\"\\n\\thint=\\\"stable\\\"\\n\\tautocomplete=\\\"on\\\"\\n\\/>\"', 1, '2022-09-21 05:11:52', '2023-08-11 09:52:31', 5, '', 1027, 'ef4b98c9-09b8-4dc9-9940-415c4e913ae1', '', '', '', '', ''),
+(3062, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'State', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"state\\\"\\n\\tlabel=\\\"State\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tclass=\\\"text_area\\\"\\n\\trequired=\\\"true\\\"\\n\\tfilter=\\\"WORD\\\"\\n\\thint=\\\"stable\\\"\\n\\tautocomplete=\\\"on\\\"\\n\\/>\"', 1, '2022-09-21 05:11:52', '2024-10-10 22:04:19', 6, '', 1027, 'ef4b98c9-09b8-4dc9-9940-415c4e913ae1', '', '', '', '', ''),
 (3063, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'Today Line Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"today_line_color\\\"\\n\\tdefault=\\\"#f44321\\\"\\n\\tlabel=\\\"Today Line Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:12:19', '2023-08-11 06:51:14', 4, '', 1027, 'cb60a327-5ce5-4b48-a8e0-27321022bf40', '', '', '', '', ''),
 (3064, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'Today Text Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"today_text_color\\\"\\n\\tdefault=\\\"#f44321\\\"\\n\\tlabel=\\\"Today Text Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:12:36', '2023-08-11 06:51:05', 4, '', 1027, 'a2e37110-c69f-41b3-b05b-f5f51d0d9ab4', '', '', '', '', ''),
 (3065, '', '', '', '', '', '', '', '', 10, '', 'VARCHAR', '', '', '', 'Years Line Colour', 'NOT NULL', '', 5, '\"<field\\n\\ttype=\\\"color\\\"\\n\\tname=\\\"years_line_color\\\"\\n\\tdefault=\\\"#5091cd\\\"\\n\\tlabel=\\\"Years Line Colour\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2022-09-21 05:13:57', '2023-08-11 06:51:23', 3, '', 1027, '9e2dcfc2-ea21-4caf-88aa-f0706d5878e5', '', '', '', '', ''),
@@ -2621,7 +2621,7 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (3421, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Crop Width (in pixels)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"width\\\"\\n\\tlabel=\\\"Height (in pixels)\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Enter some description\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"INT\\\"\\n\\thint=\\\"Only Numbers\\\"\\n\\tautocomplete=\\\"on\\\"\\n\\tonchange=\\\"this.value = this.value.replace(\\/\\\\D\\/g, \'\');\\\"\\n\\/>\"', 1, '2020-09-08 00:06:03', '2024-09-16 23:47:18', 6, '', 1079, '1616608c-5307-4496-89e2-36a326a84716', '', '', '', '', ''),
 (3422, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Crop Height (in pixels)', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"height\\\"\\n\\tlabel=\\\"Height (in pixels)\\\"\\n\\tsize=\\\"10\\\"\\n\\tmaxlength=\\\"50\\\"\\n\\tdescription=\\\"Crop the height of an image.\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"INT\\\"\\n\\thint=\\\"Only Numbers\\\"\\n\\tautocomplete=\\\"on\\\"\\n\\tonchange=\\\"this.value = this.value.replace(\\/\\\\D\\/g, \'\');\\\"\\n\\/>\"', 1, '2020-09-08 00:07:09', '2024-09-16 23:47:12', 7, '', 1079, 'ab0d3b92-bd90-4957-ab71-cbc7a5fabeb3', '', '', '', '', ''),
 (3423, '', '', '', '', '', '', '', '', 11, '', 'INT', 2, '', '', 'Download Access', 'NULL', '', 34, '\"<field\\n\\ttype=\\\"accesslevel\\\"\\n\\tname=\\\"download_access\\\"\\n\\tlabel=\\\"Download Access\\\"\\n\\tdescription=\\\"Select the access level that is allowed to download this file.\\\"\\n\\tclass=\\\"list_class\\\"\\n\\trequired=\\\"true\\\"\\n\\tmultiple=\\\"false\\\"\\n\\/>\"', 1, '2024-09-12 23:58:19', '2024-09-15 22:49:34', 2, '', 894, '794ac8d4-c78b-4f98-9953-07e4ce5ad491', '', '', '', '', ''),
-(3424, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', 2, '', '', 'Mime', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"mime\\\"\\n\\tlabel=\\\"Mime\\\"\\n\\tdescription=\\\"The mime is set here. No dot!\\\"\\n\\trequired=\\\"true\\\"\\n\\tmessage=\\\"Error! Please add the Mime here.\\\"\\n\\thint=\\\"application\\/jpg\\\"\\n\\/>\"', 1, '2024-09-13 00:29:08', '2024-09-15 23:14:45', 3, '', 1063, '68c1e141-fb2e-49a6-bf56-1da6d8a058e8', '', '', '', '', ''),
+(3424, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Mime', 'NULL', '', 24, '\"<field\\n\\ttype=\\\"text\\\"\\n\\tname=\\\"mime\\\"\\n\\tlabel=\\\"Mime\\\"\\n\\tdescription=\\\"The mime is set here. No dot!\\\"\\n\\trequired=\\\"true\\\"\\n\\tmessage=\\\"Error! Please add the Mime here.\\\"\\n\\thint=\\\"application\\/jpg\\\"\\n\\/>\"', 1, '2024-09-13 00:29:08', '2024-10-10 21:27:19', 4, '', 1063, '68c1e141-fb2e-49a6-bf56-1da6d8a058e8', '', '', '', '', ''),
 (3425, '', '', '', '', '', '', '', '', 64, '', 'VARCHAR', 2, '', '', 'Target (Files)', 'NULL', '', 11, '\"<field\\n\\ttype=\\\"list\\\"\\n\\tname=\\\"target\\\"\\n\\tlabel=\\\"Target\\\"\\n\\tlayout=\\\"joomla.form.field.list-fancy-select\\\"\\n\\tmultiple=\\\"true\\\"\\n\\trequired=\\\"true\\\"\\n\\toption=\\\"look\\\"\\n\\/>\"', 1, '2024-09-14 02:44:19', '2024-09-15 22:50:33', 2, '', 1080, 'e24026ef-294a-48e5-9be0-3f95dcb2b66b', '', '', '', '', ''),
 (3426, '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Note VDM File Display', 'NOT NULL', '', 14, '\"<field\\n\\ttype=\\\"note\\\"\\n\\tname=\\\"note_file_vdm_display\\\"\\n\\tdescription=\\\"<br>\\r\\n<div id=\'file_vdm_success\' hidden><\\/div>\\r\\n<div id=\'file_vdm_error\' hidden><\\/div>\\r\\n<div id=\'file_vdm_display\' hidden><\\/div>\\\"\\n\\/>\"', 1, '2024-09-14 02:58:38', '2024-09-14 02:57:23', 1, '', 1075, '639e63b1-a63d-4d40-853f-42e7b28a5d35', '', '', '', '', ''),
 (3427, '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', 2, '', '', 'Confirm Password2', 'NULL', '', 16, '\"<field\\n\\ttype=\\\"password\\\"\\n\\tname=\\\"password2\\\"\\n\\tlabel=\\\"Confirm Password\\\"\\n\\tsize=\\\"50\\\"\\n\\tdescription=\\\"Enter the password for the user.\\\"\\n\\tmessage=\\\"Error! Please add the password here.\\\"\\n\\tclass=\\\"validate-passwordExtra\\\"\\n\\tvalidate=\\\"equals\\\"\\n\\tfield=\\\"password\\\"\\n\\tfilter=\\\"raw\\\"\\n\\tautocomplete=\\\"new-password\\\"\\n\\/>\"', 1, '2024-09-15 22:31:43', '2024-09-15 22:32:42', 2, '', 884, '27c39335-cd12-46a5-82e7-26d3c67b9bb6', '', '', '', '', ''),
@@ -2640,7 +2640,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `description`, `name`, `prope
 (5, 'Provides a color picker. Enter the color as #ff00ff or pick it from the palet.', 'Color', '{\"properties0\":{\"name\":\"type\",\"example\":\"color\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be color.\"},\"properties1\":{\"name\":\"name\",\"example\":\"backgroundcolor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"default\",\"example\":\"#FFFFFF\",\"adjustable\":\"1\",\"description\":\"(optional) provides a color when not set.\"},\"properties3\":{\"name\":\"label\",\"example\":\"Background\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties4\":{\"name\":\"description\",\"example\":\"Select the background color here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) tooltip for the form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides a color picker when clicking the input box.', '', 1, 5, '', '', '7f60f198-53e7-4fe9-813f-d1b6c553680e'),
 (6, 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties12\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties13\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties14\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties15\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties16\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties17\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties18\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties25\":{\"name\":\"entity\",\"example\":\"fieldtype\",\"adjustable\":\"1\",\"description\":\"(optional) The area\\/entity this custom field is loaded. This value can be used in the field custom code.\"},\"properties19\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties20\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties21\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties22\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties23\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties24\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = Factory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = Factory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = [];\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\tif ($this->multiple === false)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', \'\', Text::_(\'Select an option\'));\\r\\n\\t\\t\\t}\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = Html::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 31, '', '', 'dd2e1f4b-f5db-45e8-85fa-efd27bae7b6a'),
 (7, 'The a list of users that can be targeting one or more groups and excluded users that already belongs to an item in a view.', 'CustomUser', '{\"properties0\":{\"name\":\"type\",\"example\":\"staffusers\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type.\"},\"properties1\":{\"name\":\"name\",\"example\":\"staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties5\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties8\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties9\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties10\":{\"name\":\"hint\",\"example\":\"select a user\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties12\":{\"name\":\"extends\",\"example\":\"user\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties13\":{\"name\":\"table\",\"example\":\"#__users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. Must be #__users\"},\"properties14\":{\"name\":\"component\",\"example\":\"com_users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties15\":{\"name\":\"view\",\"example\":\"###view###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties16\":{\"name\":\"views\",\"example\":\"###views###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties17\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to.\"},\"properties18\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key.\"},\"properties19\":{\"name\":\"type_php_1\",\"example\":\"\\t\\t\\/\\/ set the groups array\\r\\n\\t\\treturn ComponentHelper::getParams(\'com_###component###\')->get(\'###type###\');\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties22\":{\"name\":\"type_phpx_1\",\"example\":\"\\t\\t\\/\\/ To ensure that there is only one record per user\\r\\n\\t\\t\\/\\/ Get a db connection.\\r\\n\\t\\t$db = Factory::getDbo();\\r\\n\\t\\t\\/\\/ Create a new query object.\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t\\/\\/ Select all records from the #__###component###_###view### table from ###CODE### column\\\".\\r\\n\\t\\t$query->select($db->quoteName(\'###CODE###\'));\\r\\n\\t\\t$query->from($db->quoteName(\'#__###component###_###view###\'));\\r\\n\\t\\t$db->setQuery($query);\\r\\n\\t\\t$db->execute();\\r\\n\\t\\t$found = $db->getNumRows();\\r\\n\\t\\tif ($found)\\r\\n\\t\\t{\\r\\n\\t\\t\\t\\/\\/ return all users already used\\r\\n\\t\\t\\treturn array_unique($db->loadColumn());\\r\\n\\t\\t}\\r\\n\\t\\treturn null;\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"}}', 'Provides list of users.', '', 1, 6, '', '', 'a4a39f70-070f-459c-be4b-0ac103a29b9a'),
-(8, 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides an editor area field.', '', 1, 11, '', '', '51f288d2-6eaa-42bc-a182-a6f69b3032b8'),
+(8, 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"}}', 'provides an editor area field.', '', 1, 12, '', '', '51f288d2-6eaa-42bc-a182-a6f69b3032b8'),
 (9, 'The hidden form field type provides a hidden field for saving a field whose value cannot be altered directly by a user in the Administrator (it can be altered in code or by editing the params.ini file). If the parameter has a saved value this is entered i', 'Hidden', '{\"properties0\":{\"name\":\"type\",\"example\":\"hidden\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be hidden.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mysecretvariable\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the data which needs to be collected.\"},\"properties5\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties4\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"}}', 'provides a hidden field for saving a form field whose value cannot be altered directly by a user.', '', 1, 2, '', '', '82f1b5ca-bb9b-44d7-9a7a-9a03fb2a31dd'),
 (10, 'The integer form field type provides a select box with a range of integer values. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Integer', '{\"properties0\":{\"name\":\"type\",\"example\":\"integer\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be integer.\"},\"properties1\":{\"name\":\"name\",\"example\":\"size\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Size\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties6\":{\"name\":\"class\",\"example\":\"text_area\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties7\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties8\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties9\":{\"name\":\"first\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) this value is the lowest on the list.\"},\"properties10\":{\"name\":\"last\",\"example\":\"20\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) this value is the highest on the list.\"},\"properties11\":{\"name\":\"step\",\"example\":\"5\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) each option will be the previous option incremented by this integer, starting with the first value until the last value is reached.\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field. https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties13\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'provides a drop down list of integers between a minimum and maximum.', '', 1, 6, '', '', 'fdbb50ea-35d2-45b2-a0bc-076fdf1544b8'),
 (11, 'The list form field type provides a drop down list or a list box of custom-defined entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'List', '{\"properties0\":{\"name\":\"type\",\"example\":\"list\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be list.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mylist\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an option\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"layout\",\"example\":\"joomla.form.field.list-fancy-select\",\"adjustable\":\"1\",\"description\":\"(optional) New layout field added in Joomla 4\"},\"properties7\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties8\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) filter options\"},\"properties9\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties10\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties11\":{\"name\":\"option\",\"example\":\"0|Option 1,1|Option 2,2|Option 1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties12\":{\"name\":\"useglobal\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional)  if set to true, it will show the value that is set in the global configuration if found in the database.\"},\"properties13\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) is the default list item value.\"},\"properties14\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+ https:\\/\\/joomla.stackexchange.com\\/a\\/17682\\/2166\"},\"properties15\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'provides a drop down list of custom-defined entries.', '', 1, 12, '', '', 'a51dfc06-1b9b-4d0a-86ba-f705bcd40d4d'),
diff --git a/admin/src/Helper/ComponentbuilderHelper.php b/admin/src/Helper/ComponentbuilderHelper.php
index 3b0bae954..33551bc67 100644
--- a/admin/src/Helper/ComponentbuilderHelper.php
+++ b/admin/src/Helper/ComponentbuilderHelper.php
@@ -49,6 +49,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as CompilerFactory;
 use VDM\Joomla\Utilities\Base64Helper;
 use VDM\Joomla\FOF\Encrypt\AES;
+use VDM\Joomla\Utilities\DateHelper;
 use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 use VDM\Joomla\Utilities\String\FieldHelper as StringFieldHelper;
 use VDM\Joomla\Utilities\String\TypeHelper;
@@ -2166,7 +2167,7 @@ abstract class ComponentbuilderHelper
 	{
 		if (!isset(self::$session) || !ObjectHelper::check(self::$session))
 		{
-			self::$session = Factory::getSession();
+			self::$session = Factory::getApplication()->getSession();
 		}
 		// set the defaults
 		self::setSessionDefaults();
@@ -2179,7 +2180,7 @@ abstract class ComponentbuilderHelper
 	{
 		if (!isset(self::$session) || !ObjectHelper::check(self::$session))
 		{
-			self::$session = Factory::getSession();
+			self::$session = Factory::getApplication()->getSession();
 		}
 		// set to local memory to speed up program
 		self::$localSession[$key] = $value;
@@ -2194,7 +2195,7 @@ abstract class ComponentbuilderHelper
 	{
 		if (!isset(self::$session) || !ObjectHelper::check(self::$session))
 		{
-			self::$session = Factory::getSession();
+			self::$session = Factory::getApplication()->getSession();
 		}
 		// check if in local memory
 		if (!isset(self::$localSession[$key]))
@@ -5230,193 +5231,245 @@ abstract class ComponentbuilderHelper
 
 
 	/**
-	 * Change to nice fancy date
+	 * Convert a date to a human-readable fancy format (e.g., "1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted date.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::fancyDate($date, $checkStamp);
 	 */
-	public static function fancyDate($date, $check_stamp = true)
+	public static function fancyDate($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('jS \o\f F Y',$date);
+		return DateHelper::fancyDate($date, $checkStamp);
 	}
 
 	/**
-	 * get date based in period past
+	 * Get a formatted date based on the time period (dynamic format based on age of the date).
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted date.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::fancyDynamicDate($date, $checkStamp);
 	 */
-	public static function fancyDynamicDate($date, $check_stamp = true)
+	public static function fancyDynamicDate($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		// older then year
-		$lastyear = date("Y", strtotime("-1 year"));
-		$tragetyear = date("Y", $date);
-		if ($tragetyear <= $lastyear)
-		{
-			return date('m/d/y', $date);
-		}
-		// same day
-		$yesterday = strtotime("-1 day");
-		if ($date > $yesterday)
-		{
-			return date('g:i A', $date);
-		}
-		// just month day
-		return date('M j', $date);
+		return DateHelper::fancyDynamicDate($date, $checkStamp);
 	}
 
 	/**
-	 * Change to nice fancy day time and date
+	 * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted day, time, and date.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::fancyDayTimeDate($date, $checkStamp);
 	 */
-	public static function fancyDayTimeDate($time, $check_stamp = true)
+	public static function fancyDayTimeDate($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($time))
-		{
-			$time = strtotime($time);
-		}
-		return date('D ga jS \o\f F Y',$time);
+		return DateHelper::fancyDayTimeDate($date, $checkStamp);
 	}
 
 	/**
-	 * Change to nice fancy time and date
+	 * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted time and date.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::fancyDateTime($date, $checkStamp);
 	 */
-	public static function fancyDateTime($time, $check_stamp = true)
+	public static function fancyDateTime($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($time))
-		{
-			$time = strtotime($time);
-		}
-		return date('(G:i) jS \o\f F Y',$time);
+		return DateHelper::fancyDateTime($date, $checkStamp);
 	}
 
 	/**
-	 * Change to nice hour:minutes time
+	 * Convert a time to a human-readable format (e.g., "12:00").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted time.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::fancyTime($date, $checkStamp);
 	 */
-	public static function fancyTime($time, $check_stamp = true)
+	public static function fancyTime($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($time))
-		{
-			$time = strtotime($time);
-		}
-		return date('G:i',$time);
+		return DateHelper::fancyTime($date, $checkStamp);
 	}
 
 	/**
-	 * set the date day as Sunday through Saturday
+	 * Convert a date to the day name (e.g., "Sunday").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day name.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setDayName($date, $checkStamp);
 	 */
-	public static function setDayName($date, $check_stamp = true)
+	public static function setDayName($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('l', $date);
+		return DateHelper::setDayName($date, $checkStamp);
 	}
 
 	/**
-	 * set the date month as January through December
+	 * Convert a date to the month name (e.g., "January").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Month name.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setMonthName($date, $checkStamp);
 	 */
-	public static function setMonthName($date, $check_stamp = true)
+	public static function setMonthName($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('F', $date);
+		return DateHelper::setMonthName($date, $checkStamp);
 	}
 
 	/**
-	 * set the date day as 1st
+	 * Convert a date to the day with suffix (e.g., "1st").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day with suffix.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setDay($date, $checkStamp);
 	 */
-	public static function setDay($date, $check_stamp = true)
+	public static function setDay($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('jS', $date);
+		return DateHelper::setDay($date, $checkStamp);
 	}
 
 	/**
-	 * set the date month as 5
+	 * Convert a date to the numeric month (e.g., "5").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Numeric month.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setMonth($date, $checkStamp);
 	 */
-	public static function setMonth($date, $check_stamp = true)
+	public static function setMonth($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('n', $date);
+		return DateHelper::setMonth($date, $checkStamp);
 	}
 
 	/**
-	 * set the date year as 2004 (for charts)
+	 * Convert a date to the full year (e.g., "2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Full year.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setYear($date, $checkStamp);
 	 */
-	public static function setYear($date, $check_stamp = true)
+	public static function setYear($date, bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('Y', $date);
+		return DateHelper::setYear($date, $checkStamp);
 	}
 
 	/**
-	 * set the date as 2004/05 (for charts)
+	 * Convert a date to a year/month format (e.g., "2024/05").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Year/Month format.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setYearMonth($date, $spacer, $checkStamp);
 	 */
-	public static function setYearMonth($date, $spacer = '/', $check_stamp = true)
+	public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('Y' . $spacer . 'm', $date);
+		return DateHelper::setYearMonth($date, $spacer, $checkStamp);
 	}
 
 	/**
-	 * set the date as 2004/05/03 (for charts)
+	 * Convert a date to a year/month/day format (e.g., "2024/05/03").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Year/Month/Day format.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setYearMonthDay($date, $spacer, $checkStamp);
 	 */
-	public static function setYearMonthDay($date, $spacer = '/', $check_stamp = true)
+	public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('Y' . $spacer . 'm' . $spacer . 'd', $date);
+		return DateHelper::setYearMonthDay($date, $spacer, $checkStamp);
 	}
 
 	/**
-	 * set the date as 03/05/2004
+	 * Convert a date to a day/month/year format (e.g., "03/05/2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day/Month/Year format.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::setDayMonthYear($date, $spacer, $checkStamp);
 	 */
-	public static function setDayMonthYear($date, $spacer = '/', $check_stamp = true)
+	public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string
 	{
-		if ($check_stamp && !self::isValidTimeStamp($date))
-		{
-			$date = strtotime($date);
-		}
-		return date('d' . $spacer . 'm' . $spacer . 'Y', $date);
+		return DateHelper::setDayMonthYear($date, $spacer, $checkStamp);
 	}
 
 	/**
-	 * Check if string is a valid time stamp
+	 * Convert a date string to a valid timestamp.
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return int The valid timestamp.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::getValidTimestamp($date, $checkStamp);
 	 */
-	public static function isValidTimeStamp($timestamp)
+	public static function getValidTimestamp($date, bool $checkStamp): int
 	{
-		return ((int) $timestamp === $timestamp)
-		&& ($timestamp <= PHP_INT_MAX)
-		&& ($timestamp >= ~PHP_INT_MAX);
+		return DateHelper::getValidTimestamp($date, $checkStamp);
 	}
 
 	/**
-	 * Check if string is a valid date
-	 * https://www.php.net/manual/en/function.checkdate.php#113205
+	 * Check if the input is a valid Unix timestamp.
+	 *
+	 * @param mixed $timestamp The timestamp to validate.
+	 *
+	 * @return bool True if valid timestamp, false otherwise.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::isValidTimeStamp($timestamp);
 	 */
-	public static function isValidateDate($date, $format = 'Y-m-d H:i:s')
+	public static function isValidTimeStamp($timestamp): bool
 	{
-		$d = DateTime::createFromFormat($format, $date);
-		return $d && $d->format($format) == $date;
+		return DateHelper::isValidTimeStamp($timestamp);
+	}
+
+	/**
+	 * Check if a string is a valid date according to the specified format.
+	 *
+	 * @param string $date The date string to validate.
+	 * @param string $format The format to check against (default is 'Y-m-d H:i:s').
+	 *
+	 * @return bool True if valid date, false otherwise.
+	 * @since 3.0.0
+	 * @deprecated 4.0.0 Use DateHelper::isValidateDate($date, $format);
+	 */
+	public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool
+	{
+		return DateHelper::isValidateDate($date, $format);
 	}
 
 	/**
diff --git a/admin/src/Model/Admin_fields_relationsModel.php b/admin/src/Model/Admin_fields_relationsModel.php
index ae6ae7937..2da26bd4f 100644
--- a/admin/src/Model/Admin_fields_relationsModel.php
+++ b/admin/src/Model/Admin_fields_relationsModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -147,7 +148,7 @@ class Admin_fields_relationsModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('admin_fields_relations__'.$id))
+			if (($vdm = SessionHelper::get('admin_fields_relations__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -155,17 +156,17 @@ class Admin_fields_relationsModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
-				ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
+				SessionHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -219,7 +220,7 @@ class Admin_fields_relationsModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('admin_fields_relations__'.$id))
+			if (($vdm = SessionHelper::get('admin_fields_relations__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -227,17 +228,17 @@ class Admin_fields_relationsModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
-				ComponentbuilderHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'admin_fields_relations__'.$id);
+				SessionHelper::set('admin_fields_relations__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Admin_viewModel.php b/admin/src/Model/Admin_viewModel.php
index c0203d829..0e4e94da9 100644
--- a/admin/src/Model/Admin_viewModel.php
+++ b/admin/src/Model/Admin_viewModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -296,7 +297,7 @@ class Admin_viewModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('admin_view__'.$id))
+			if (($vdm = SessionHelper::get('admin_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -304,17 +305,17 @@ class Admin_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id);
-				ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'admin_view__'.$id);
+				SessionHelper::set('admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -644,7 +645,7 @@ class Admin_viewModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('admin_view__'.$id))
+			if (($vdm = SessionHelper::get('admin_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -652,17 +653,17 @@ class Admin_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'admin_view__'.$id);
-				ComponentbuilderHelper::set('admin_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'admin_view__'.$id);
+				SessionHelper::set('admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 			// update the fields
@@ -1073,7 +1074,7 @@ class Admin_viewModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/AjaxModel.php b/admin/src/Model/AjaxModel.php
index 033972902..d894b755e 100644
--- a/admin/src/Model/AjaxModel.php
+++ b/admin/src/Model/AjaxModel.php
@@ -36,6 +36,7 @@ use VDM\Joomla\Componentbuilder\Search\Factory as SearchFactory;
 use VDM\Joomla\Utilities\ArrayHelper as UtilitiesArrayHelper;
 use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\Base64Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper;
 use VDM\Joomla\Utilities\FormHelper;
@@ -1674,7 +1675,7 @@ class AjaxModel extends ListModel
 	 * @var	array
 	 * @since 3.0.13
 	 */
-	protected $viewid = [];
+	protected array $viewid = [];
 
 	/**
 	 * Get the view details via the session
@@ -1694,7 +1695,7 @@ class AjaxModel extends ListModel
 			if ($vdm)
 			{
 				// set view and id
-				if ($view = ComponentbuilderHelper::get($vdm))
+				if (($view = SessionHelper::get($vdm)) !== null)
 				{
 					$current = (array) explode('__', $view);
 					if (StringHelper::check($current[0]) && isset($current[1]) && is_numeric($current[1]))
@@ -1707,7 +1708,7 @@ class AjaxModel extends ListModel
 					}
 				}
 				// set GUID if found
-				if (($guid = ComponentbuilderHelper::get($vdm . '__guid')) !== false)
+				if (($guid = SessionHelper::get($vdm . '__guid')) !== null)
 				{
 					if (GuidHelper::valid($guid))
 					{
@@ -1715,7 +1716,7 @@ class AjaxModel extends ListModel
 					}
 				}
 				// set return if found
-				if (($return = ComponentbuilderHelper::get($vdm . '__return')) !== false)
+				if (($return = SessionHelper::get($vdm . '__return')) !== null)
 				{
 					if (StringHelper::check($return))
 					{
diff --git a/admin/src/Model/Class_extendsModel.php b/admin/src/Model/Class_extendsModel.php
index bf66a7dcf..f385e42e9 100644
--- a/admin/src/Model/Class_extendsModel.php
+++ b/admin/src/Model/Class_extendsModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -151,7 +152,7 @@ class Class_extendsModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_extends__'.$id))
+			if (($vdm = SessionHelper::get('class_extends__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -159,17 +160,17 @@ class Class_extendsModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id);
-				ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_extends__'.$id);
+				SessionHelper::set('class_extends__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -227,7 +228,7 @@ class Class_extendsModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_extends__'.$id))
+			if (($vdm = SessionHelper::get('class_extends__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -235,17 +236,17 @@ class Class_extendsModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_extends__'.$id);
-				ComponentbuilderHelper::set('class_extends__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_extends__'.$id);
+				SessionHelper::set('class_extends__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Class_methodModel.php b/admin/src/Model/Class_methodModel.php
index e2fd9a17e..32ca9e625 100644
--- a/admin/src/Model/Class_methodModel.php
+++ b/admin/src/Model/Class_methodModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -155,7 +156,7 @@ class Class_methodModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_method__'.$id))
+			if (($vdm = SessionHelper::get('class_method__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -163,17 +164,17 @@ class Class_methodModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id);
-				ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_method__'.$id);
+				SessionHelper::set('class_method__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -237,7 +238,7 @@ class Class_methodModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_method__'.$id))
+			if (($vdm = SessionHelper::get('class_method__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -245,17 +246,17 @@ class Class_methodModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_method__'.$id);
-				ComponentbuilderHelper::set('class_method__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_method__'.$id);
+				SessionHelper::set('class_method__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -611,7 +612,7 @@ class Class_methodModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Class_propertyModel.php b/admin/src/Model/Class_propertyModel.php
index 03aa78f0c..9bebb9dc1 100644
--- a/admin/src/Model/Class_propertyModel.php
+++ b/admin/src/Model/Class_propertyModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -152,7 +153,7 @@ class Class_propertyModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_property__'.$id))
+			if (($vdm = SessionHelper::get('class_property__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -160,17 +161,17 @@ class Class_propertyModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id);
-				ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_property__'.$id);
+				SessionHelper::set('class_property__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -228,7 +229,7 @@ class Class_propertyModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('class_property__'.$id))
+			if (($vdm = SessionHelper::get('class_property__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -236,17 +237,17 @@ class Class_propertyModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'class_property__'.$id);
-				ComponentbuilderHelper::set('class_property__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'class_property__'.$id);
+				SessionHelper::set('class_property__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -602,7 +603,7 @@ class Class_propertyModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Component_dashboardModel.php b/admin/src/Model/Component_dashboardModel.php
index e51810ea2..24de4d0aa 100644
--- a/admin/src/Model/Component_dashboardModel.php
+++ b/admin/src/Model/Component_dashboardModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -155,7 +156,7 @@ class Component_dashboardModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id))
+			if (($vdm = SessionHelper::get('component_dashboard__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -163,17 +164,17 @@ class Component_dashboardModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
-				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
+				SessionHelper::set('component_dashboard__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -233,7 +234,7 @@ class Component_dashboardModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('component_dashboard__'.$id))
+			if (($vdm = SessionHelper::get('component_dashboard__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -241,17 +242,17 @@ class Component_dashboardModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
-				ComponentbuilderHelper::set('component_dashboard__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'component_dashboard__'.$id);
+				SessionHelper::set('component_dashboard__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 			// update the fields
diff --git a/admin/src/Model/Component_routerModel.php b/admin/src/Model/Component_routerModel.php
index d22a015d7..e80c63f2f 100644
--- a/admin/src/Model/Component_routerModel.php
+++ b/admin/src/Model/Component_routerModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -156,7 +157,7 @@ class Component_routerModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('component_router__'.$id))
+			if (($vdm = SessionHelper::get('component_router__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -164,17 +165,17 @@ class Component_routerModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'component_router__'.$id);
-				ComponentbuilderHelper::set('component_router__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'component_router__'.$id);
+				SessionHelper::set('component_router__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -246,7 +247,7 @@ class Component_routerModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('component_router__'.$id))
+			if (($vdm = SessionHelper::get('component_router__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -254,17 +255,17 @@ class Component_routerModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'component_router__'.$id);
-				ComponentbuilderHelper::set('component_router__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'component_router__'.$id);
+				SessionHelper::set('component_router__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Custom_admin_viewModel.php b/admin/src/Model/Custom_admin_viewModel.php
index 32516756d..c29b6cda7 100644
--- a/admin/src/Model/Custom_admin_viewModel.php
+++ b/admin/src/Model/Custom_admin_viewModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -213,7 +214,7 @@ class Custom_admin_viewModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id))
+			if (($vdm = SessionHelper::get('custom_admin_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -221,17 +222,17 @@ class Custom_admin_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
-				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
+				SessionHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -381,7 +382,7 @@ class Custom_admin_viewModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id))
+			if (($vdm = SessionHelper::get('custom_admin_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -389,17 +390,17 @@ class Custom_admin_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
-				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
+				SessionHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 
diff --git a/admin/src/Model/Custom_codeModel.php b/admin/src/Model/Custom_codeModel.php
index 1bc07f18a..97d9c78c0 100644
--- a/admin/src/Model/Custom_codeModel.php
+++ b/admin/src/Model/Custom_codeModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -167,7 +168,7 @@ class Custom_codeModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('custom_code__'.$id))
+			if (($vdm = SessionHelper::get('custom_code__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -175,17 +176,17 @@ class Custom_codeModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id);
-				ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'custom_code__'.$id);
+				SessionHelper::set('custom_code__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -237,7 +238,7 @@ class Custom_codeModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('custom_code__'.$id))
+			if (($vdm = SessionHelper::get('custom_code__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -245,17 +246,17 @@ class Custom_codeModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'custom_code__'.$id);
-				ComponentbuilderHelper::set('custom_code__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'custom_code__'.$id);
+				SessionHelper::set('custom_code__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -604,7 +605,7 @@ class Custom_codeModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Dynamic_getModel.php b/admin/src/Model/Dynamic_getModel.php
index a6553e854..68dfbf3ea 100644
--- a/admin/src/Model/Dynamic_getModel.php
+++ b/admin/src/Model/Dynamic_getModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -207,7 +208,7 @@ class Dynamic_getModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id))
+			if (($vdm = SessionHelper::get('dynamic_get__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -215,17 +216,17 @@ class Dynamic_getModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
-				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
+				SessionHelper::set('dynamic_get__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -381,7 +382,7 @@ class Dynamic_getModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id))
+			if (($vdm = SessionHelper::get('dynamic_get__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -389,17 +390,17 @@ class Dynamic_getModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
-				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
+				SessionHelper::set('dynamic_get__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 
@@ -795,7 +796,7 @@ class Dynamic_getModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/FieldModel.php b/admin/src/Model/FieldModel.php
index 70dacfd9e..3fcc53315 100644
--- a/admin/src/Model/FieldModel.php
+++ b/admin/src/Model/FieldModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -200,7 +201,7 @@ class FieldModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('field__'.$id))
+			if (($vdm = SessionHelper::get('field__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -208,17 +209,17 @@ class FieldModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
-				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'field__'.$id);
+				SessionHelper::set('field__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -318,7 +319,7 @@ class FieldModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('field__'.$id))
+			if (($vdm = SessionHelper::get('field__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -326,17 +327,17 @@ class FieldModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
-				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'field__'.$id);
+				SessionHelper::set('field__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -690,7 +691,7 @@ class FieldModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/FieldtypeModel.php b/admin/src/Model/FieldtypeModel.php
index fe2c761e3..f6db01ef0 100644
--- a/admin/src/Model/FieldtypeModel.php
+++ b/admin/src/Model/FieldtypeModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -174,7 +175,7 @@ class FieldtypeModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('fieldtype__'.$id))
+			if (($vdm = SessionHelper::get('fieldtype__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -182,17 +183,17 @@ class FieldtypeModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
-				ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'fieldtype__'.$id);
+				SessionHelper::set('fieldtype__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -246,7 +247,7 @@ class FieldtypeModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('fieldtype__'.$id))
+			if (($vdm = SessionHelper::get('fieldtype__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -254,17 +255,17 @@ class FieldtypeModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'fieldtype__'.$id);
-				ComponentbuilderHelper::set('fieldtype__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'fieldtype__'.$id);
+				SessionHelper::set('fieldtype__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 			// check what type of properties array we have here (should be subform... but just incase)
@@ -870,7 +871,7 @@ class FieldtypeModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Help_documentModel.php b/admin/src/Model/Help_documentModel.php
index e9e067bd5..8acd25516 100644
--- a/admin/src/Model/Help_documentModel.php
+++ b/admin/src/Model/Help_documentModel.php
@@ -490,7 +490,7 @@ class Help_documentModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Joomla_componentModel.php b/admin/src/Model/Joomla_componentModel.php
index b099b6145..d12db2673 100644
--- a/admin/src/Model/Joomla_componentModel.php
+++ b/admin/src/Model/Joomla_componentModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -331,7 +332,7 @@ class Joomla_componentModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_component__'.$id))
+			if (($vdm = SessionHelper::get('joomla_component__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -339,17 +340,17 @@ class Joomla_componentModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id);
-				ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_component__'.$id);
+				SessionHelper::set('joomla_component__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -560,7 +561,7 @@ class Joomla_componentModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_component__'.$id))
+			if (($vdm = SessionHelper::get('joomla_component__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -568,17 +569,17 @@ class Joomla_componentModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_component__'.$id);
-				ComponentbuilderHelper::set('joomla_component__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_component__'.$id);
+				SessionHelper::set('joomla_component__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 
@@ -976,7 +977,7 @@ class Joomla_componentModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Joomla_moduleModel.php b/admin/src/Model/Joomla_moduleModel.php
index 8994451aa..8589131d7 100644
--- a/admin/src/Model/Joomla_moduleModel.php
+++ b/admin/src/Model/Joomla_moduleModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -237,7 +238,7 @@ class Joomla_moduleModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_module__'.$id))
+			if (($vdm = SessionHelper::get('joomla_module__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -245,17 +246,17 @@ class Joomla_moduleModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id);
-				ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_module__'.$id);
+				SessionHelper::set('joomla_module__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -409,7 +410,7 @@ class Joomla_moduleModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_module__'.$id))
+			if (($vdm = SessionHelper::get('joomla_module__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -417,17 +418,17 @@ class Joomla_moduleModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_module__'.$id);
-				ComponentbuilderHelper::set('joomla_module__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_module__'.$id);
+				SessionHelper::set('joomla_module__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Joomla_pluginModel.php b/admin/src/Model/Joomla_pluginModel.php
index f61a2c306..f4164df5e 100644
--- a/admin/src/Model/Joomla_pluginModel.php
+++ b/admin/src/Model/Joomla_pluginModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -214,7 +215,7 @@ class Joomla_pluginModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_plugin__'.$id))
+			if (($vdm = SessionHelper::get('joomla_plugin__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -222,17 +223,17 @@ class Joomla_pluginModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
-				ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
+				SessionHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -374,7 +375,7 @@ class Joomla_pluginModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('joomla_plugin__'.$id))
+			if (($vdm = SessionHelper::get('joomla_plugin__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -382,17 +383,17 @@ class Joomla_pluginModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
-				ComponentbuilderHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'joomla_plugin__'.$id);
+				SessionHelper::set('joomla_plugin__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Language_translationModel.php b/admin/src/Model/Language_translationModel.php
index 9c610d9cb..4154ce2cb 100644
--- a/admin/src/Model/Language_translationModel.php
+++ b/admin/src/Model/Language_translationModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -147,7 +148,7 @@ class Language_translationModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('language_translation__'.$id))
+			if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -155,17 +156,17 @@ class Language_translationModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id);
-				ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'language_translation__'.$id);
+				SessionHelper::set('language_translation__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -237,7 +238,7 @@ class Language_translationModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('language_translation__'.$id))
+			if (($vdm = SessionHelper::get('language_translation__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -245,17 +246,17 @@ class Language_translationModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id);
-				ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'language_translation__'.$id);
+				SessionHelper::set('language_translation__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/LayoutModel.php b/admin/src/Model/LayoutModel.php
index 36e6f6bcd..b8ac82818 100644
--- a/admin/src/Model/LayoutModel.php
+++ b/admin/src/Model/LayoutModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -169,7 +170,7 @@ class LayoutModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('layout__'.$id))
+			if (($vdm = SessionHelper::get('layout__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -177,17 +178,17 @@ class LayoutModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id);
-				ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'layout__'.$id);
+				SessionHelper::set('layout__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -253,7 +254,7 @@ class LayoutModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('layout__'.$id))
+			if (($vdm = SessionHelper::get('layout__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -261,17 +262,17 @@ class LayoutModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'layout__'.$id);
-				ComponentbuilderHelper::set('layout__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'layout__'.$id);
+				SessionHelper::set('layout__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/LibraryModel.php b/admin/src/Model/LibraryModel.php
index 64209ed1c..ffe9c5964 100644
--- a/admin/src/Model/LibraryModel.php
+++ b/admin/src/Model/LibraryModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -185,7 +186,7 @@ class LibraryModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('library__'.$id))
+			if (($vdm = SessionHelper::get('library__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -193,17 +194,17 @@ class LibraryModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
-				ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'library__'.$id);
+				SessionHelper::set('library__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -271,7 +272,7 @@ class LibraryModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('library__'.$id))
+			if (($vdm = SessionHelper::get('library__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -279,17 +280,17 @@ class LibraryModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'library__'.$id);
-				ComponentbuilderHelper::set('library__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'library__'.$id);
+				SessionHelper::set('library__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -626,7 +627,7 @@ class LibraryModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/PlaceholderModel.php b/admin/src/Model/PlaceholderModel.php
index d0f0eaac8..fa3ecf5d5 100644
--- a/admin/src/Model/PlaceholderModel.php
+++ b/admin/src/Model/PlaceholderModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -149,7 +150,7 @@ class PlaceholderModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('placeholder__'.$id))
+			if (($vdm = SessionHelper::get('placeholder__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -157,17 +158,17 @@ class PlaceholderModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'placeholder__'.$id);
-				ComponentbuilderHelper::set('placeholder__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'placeholder__'.$id);
+				SessionHelper::set('placeholder__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -219,7 +220,7 @@ class PlaceholderModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('placeholder__'.$id))
+			if (($vdm = SessionHelper::get('placeholder__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -227,17 +228,17 @@ class PlaceholderModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'placeholder__'.$id);
-				ComponentbuilderHelper::set('placeholder__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'placeholder__'.$id);
+				SessionHelper::set('placeholder__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/PowerModel.php b/admin/src/Model/PowerModel.php
index 6770eaded..062235315 100644
--- a/admin/src/Model/PowerModel.php
+++ b/admin/src/Model/PowerModel.php
@@ -30,6 +30,7 @@ use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
 use VDM\Joomla\Componentbuilder\Power\Factory as PowerFactory;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -195,7 +196,7 @@ class PowerModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('power__'.$id))
+			if (($vdm = SessionHelper::get('power__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -203,17 +204,17 @@ class PowerModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'power__'.$id);
-				ComponentbuilderHelper::set('power__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'power__'.$id);
+				SessionHelper::set('power__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -339,7 +340,7 @@ class PowerModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('power__'.$id))
+			if (($vdm = SessionHelper::get('power__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -347,17 +348,17 @@ class PowerModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'power__'.$id);
-				ComponentbuilderHelper::set('power__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'power__'.$id);
+				SessionHelper::set('power__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/ServerModel.php b/admin/src/Model/ServerModel.php
index b5b4e378c..edd8e1237 100644
--- a/admin/src/Model/ServerModel.php
+++ b/admin/src/Model/ServerModel.php
@@ -547,7 +547,7 @@ class ServerModel extends AdminModel
 					// change to false
 					$form->setFieldAttribute($requiredField, 'required', 'false');
 					// also clear the data set
-					$data[$requiredField] = '';
+					unset($data[$requiredField]);
 				}
 			}
 		}
diff --git a/admin/src/Model/Site_viewModel.php b/admin/src/Model/Site_viewModel.php
index fb9852a6f..44cd344a8 100644
--- a/admin/src/Model/Site_viewModel.php
+++ b/admin/src/Model/Site_viewModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -216,7 +217,7 @@ class Site_viewModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('site_view__'.$id))
+			if (($vdm = SessionHelper::get('site_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -224,17 +225,17 @@ class Site_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id);
-				ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'site_view__'.$id);
+				SessionHelper::set('site_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -384,7 +385,7 @@ class Site_viewModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('site_view__'.$id))
+			if (($vdm = SessionHelper::get('site_view__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -392,17 +393,17 @@ class Site_viewModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id);
-				ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'site_view__'.$id);
+				SessionHelper::set('site_view__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 
diff --git a/admin/src/Model/TemplateModel.php b/admin/src/Model/TemplateModel.php
index 3a77a53c1..ac835d3a4 100644
--- a/admin/src/Model/TemplateModel.php
+++ b/admin/src/Model/TemplateModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -169,7 +170,7 @@ class TemplateModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('template__'.$id))
+			if (($vdm = SessionHelper::get('template__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -177,17 +178,17 @@ class TemplateModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'template__'.$id);
-				ComponentbuilderHelper::set('template__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'template__'.$id);
+				SessionHelper::set('template__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -253,7 +254,7 @@ class TemplateModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('template__'.$id))
+			if (($vdm = SessionHelper::get('template__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -261,17 +262,17 @@ class TemplateModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'template__'.$id);
-				ComponentbuilderHelper::set('template__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'template__'.$id);
+				SessionHelper::set('template__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/Model/Validation_ruleModel.php b/admin/src/Model/Validation_ruleModel.php
index 75ce0428e..49b88dd98 100644
--- a/admin/src/Model/Validation_ruleModel.php
+++ b/admin/src/Model/Validation_ruleModel.php
@@ -29,6 +29,7 @@ use Joomla\Utilities\ArrayHelper;
 use Joomla\Input\Input;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use VDM\Joomla\Utilities\SessionHelper;
 use VDM\Joomla\Utilities\StringHelper as UtilitiesStringHelper;
 use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Utilities\GuidHelper;
@@ -152,7 +153,7 @@ class Validation_ruleModel extends AdminModel
 				$id = $_id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('validation_rule__'.$id))
+			if (($vdm = SessionHelper::get('validation_rule__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -160,17 +161,17 @@ class Validation_ruleModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'validation_rule__'.$id);
-				ComponentbuilderHelper::set('validation_rule__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'validation_rule__'.$id);
+				SessionHelper::set('validation_rule__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
@@ -222,7 +223,7 @@ class Validation_ruleModel extends AdminModel
 				$id = $item->id;
 			}
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('validation_rule__'.$id))
+			if (($vdm = SessionHelper::get('validation_rule__'.$id)) !== null)
 			{
 				$this->vastDevMod = $vdm;
 			}
@@ -230,17 +231,17 @@ class Validation_ruleModel extends AdminModel
 			{
 				// set the vast development method key
 				$this->vastDevMod = UtilitiesStringHelper::random(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'validation_rule__'.$id);
-				ComponentbuilderHelper::set('validation_rule__'.$id, $this->vastDevMod);
+				SessionHelper::set($this->vastDevMod, 'validation_rule__'.$id);
+				SessionHelper::set('validation_rule__'.$id, $this->vastDevMod);
 				// set a return value if found
 				$jinput = Factory::getApplication()->input;
 				$return = $jinput->get('return', null, 'base64');
-				ComponentbuilderHelper::set($this->vastDevMod . '__return', $return);
+				SessionHelper::set($this->vastDevMod . '__return', $return);
 				// set a GUID value if found
 				if (isset($item) && ObjectHelper::check($item) && isset($item->guid)
 					&& GuidHelper::valid($item->guid))
 				{
-					ComponentbuilderHelper::set($this->vastDevMod . '__guid', $item->guid);
+					SessionHelper::set($this->vastDevMod . '__guid', $item->guid);
 				}
 			}
 		}
diff --git a/admin/src/View/Field/HtmlView.php b/admin/src/View/Field/HtmlView.php
index 39f864eba..d18d249e8 100644
--- a/admin/src/View/Field/HtmlView.php
+++ b/admin/src/View/Field/HtmlView.php
@@ -329,14 +329,12 @@ class HtmlView extends BaseHtmlView
 		// add return_here
 		$this->getDocument()->addScriptDeclaration("var return_here = '" . urlencode(base64_encode((string) Uri::getInstance())) . "';");
 		// add the libs for subform (since not adding it via xml but ajax)
-		Factory::getApplication()
-			->getDocument()
+		$this->getDocument()
 			->getWebAssetManager()
 			->useScript('webcomponent.field-subform')
 			->usePreset('choicesjs')
 			->useScript('webcomponent.field-fancy-select');
-		Factory::getApplication()
-			->getDocument()
+		$this->getDocument()
 			->addStyleDeclaration('.subform-table-sublayout-section .controls { margin-left: 0px }');
 		// set some lang
 		Text::script('COM_COMPONENTBUILDER_PROPERTY_ALREADY_SELECTED_TRY_ANOTHER');
diff --git a/admin/tmpl/joomla_components/default_body.php b/admin/tmpl/joomla_components/default_body.php
index 5397a605d..38f3c3df3 100644
--- a/admin/tmpl/joomla_components/default_body.php
+++ b/admin/tmpl/joomla_components/default_body.php
@@ -167,7 +167,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
 					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
+					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&field=joomla_component&field_id=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php endif; ?>
 			<?php endforeach; ?>
 
@@ -182,7 +182,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
 					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
+					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&field=joomla_component&field_id=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php endif; ?>
 			<?php endforeach; ?>
 			</div>
@@ -196,7 +196,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
 				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_component', 'id')) !== false): ?>
 					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
-					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_component&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
+					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&field=joomla_component&field_id=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php endif; ?>
 			<?php endforeach; ?>
 			</div>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 34d53c6e3..6c78cb305 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="5.0" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>7th October, 2024</creationDate>
+	<creationDate>13th October, 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://dev.vdm.io</authorUrl>
 	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.0.4-alpha2</version>
+	<version>5.0.4-alpha3</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.5.0.4-alpha2)</h1>
+		<h1>Component Builder (v.5.0.4-alpha3)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 7b3f82e83..8ba42d388 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -116,7 +116,7 @@
 		<version>5.0.4-alpha</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.4-alpha2.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.4-alpha3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>alpha</tag>
@@ -131,10 +131,10 @@
 		<element>pkg_component_builder</element>
 		<type>package</type>
 		<client>site</client>
-		<version>5.0.4-alpha2</version>
+		<version>5.0.4-alpha3</version>
 		<infourl title="Component Builder!">https://dev.vdm.io</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.4-alpha2.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.4-alpha3.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>alpha</tag>
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
index 49acad481..4285ac524 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Helper/Interpretation.php
@@ -17300,7 +17300,7 @@ class Interpretation extends Fields
 				. "\$form->setFieldAttribute(\$requiredField, 'required', 'false');";
 			$fix .= PHP_EOL . Indent::_(5) . "//" . Line::_(__Line__, __Class__)
 				. " also clear the data set";
-			$fix .= PHP_EOL . Indent::_(5) . "\$data[\$requiredField] = '';";
+			$fix .= PHP_EOL . Indent::_(5) . "unset(\$data[\$requiredField]);";
 			$fix .= PHP_EOL . Indent::_(4) . "}";
 			$fix .= PHP_EOL . Indent::_(3) . "}";
 			$fix .= PHP_EOL . Indent::_(2) . "}";
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/File/Manager.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/File/Manager.php
index 0ba12040c..7dd2c8325 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/File/Manager.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/File/Manager.php
@@ -250,6 +250,7 @@ final class Manager
 			'entity' => $entity,
 			'access' => $fileType['download_access'] ?? 1,
 			'guid' => $this->getGuid('guid'),
+			'created_by' => $this->user->id
 		];
 	}
 }
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/ChunkReadFilter.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/ChunkReadFilter.php
new file mode 100644
index 000000000..a406458e2
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/ChunkReadFilter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Spreadsheet;
+
+
+use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
+
+
+/**
+ * Chunk Read Filter Class
+ * 
+ * @since 3.2.0
+ */
+final class ChunkReadFilter implements IReadFilter
+{
+	/**
+	 * The first row to read in the current chunk.
+	 *
+	 * @var int
+	 */
+	private int $startRow;
+
+	/**
+	 * The last row to read in the current chunk.
+	 * This is calculated as $startRow + $chunkSize - 1.
+	 *
+	 * @var int
+	 */
+	private int $endRow;
+
+	/**
+	 * Constructor to initialize the chunk filter.
+	 *
+	 * @param int $startRow The starting row to read.
+	 * @param int $chunkSize The number of rows to read in each chunk.
+	 */
+	public function __construct(int $startRow, int $chunkSize)
+	{
+		$this->startRow = $startRow;
+		$this->endRow = $startRow + $chunkSize - 1;
+	}
+
+	/**
+	 * Determines whether a cell should be read based on its row and column.
+	 *
+	 * @param string $column The column index (e.g., 'A', 'B', 'C').
+	 * @param int $row The row index.
+	 * @param string|null $worksheetName The worksheet name (not used in this case).
+	 *
+	 * @return bool Whether the cell should be read.
+	 */
+	public function readCell(string $columnAddress, int $row, string $worksheetName = ''): bool
+	{
+		// Only read rows that fall within the chunk range
+		if ($row >= $this->startRow && $row <= $this->endRow)
+		{
+			return true;
+		}
+
+		return false;
+	}
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Exporter.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Exporter.php
index c5cc6470b..b470b77dc 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Exporter.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Exporter.php
@@ -12,6 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Spreadsheet;
 
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\User\User;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -105,7 +107,7 @@ final class Exporter
 			'font' => [
 				'bold' => true,
 				'color' => ['rgb' => '1171A3'],
-				'size' => 12,
+				'size' => 13,
 				'name' => 'Verdana'
 			]
 		];
@@ -289,6 +291,8 @@ final class Exporter
 			$sheet->getColumnDimension($columnIndex)->setAutoSize(true);
 			$sheet->getStyle($columnIndex . $rowIndex)->applyFromArray($this->headerStyles);
 			$sheet->getStyle($columnIndex . $rowIndex)->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
+			$row_height = ($this->headerStyles['font']['size'] ?? 13) + 5;
+			$sheet->getRowDimension($rowIndex)->setRowHeight($row_height);
 		}
 		elseif ($columnIndex === 'A')
 		{
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Header.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Header.php
index 2944f6115..a97fe41bd 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Header.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Header.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Spreadsheet;
 
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
-use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
+use VDM\Joomla\Componentbuilder\Spreadsheet\ChunkReadFilter;
 
 
 /**
@@ -40,7 +40,7 @@ final class Header
 		}
 
 		try {
-			$chunkFilter = new ChunkReadFilter(2, 1);
+			$chunkFilter = new ChunkReadFilter(1, 20);
 			$inputFileType = IOFactory::identify($filePath);
 			$reader = IOFactory::createReader($inputFileType);
 			$reader->setReadFilter($chunkFilter);
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Importer.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Importer.php
index d1460917b..b68f0a80b 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Importer.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Spreadsheet/Importer.php
@@ -13,9 +13,9 @@ namespace VDM\Joomla\Componentbuilder\Spreadsheet;
 
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
-use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use VDM\Joomla\Componentbuilder\Spreadsheet\ChunkReadFilter;
 
 
 /**
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
index af809dc24..5519d4e4b 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
@@ -42,7 +42,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -59,7 +59,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -76,7 +76,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -93,7 +93,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -127,7 +127,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -144,7 +144,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -161,7 +161,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -178,7 +178,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -195,7 +195,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -263,7 +263,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -280,7 +280,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -331,7 +331,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -348,7 +348,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -365,7 +365,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -416,7 +416,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -484,7 +484,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -501,7 +501,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -518,7 +518,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -535,7 +535,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -552,7 +552,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -569,7 +569,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -586,7 +586,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -620,7 +620,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -654,7 +654,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -671,7 +671,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -756,7 +756,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -773,7 +773,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -807,7 +807,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -892,7 +892,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -960,7 +960,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1035,7 +1035,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1171,7 +1171,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1256,7 +1256,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1406,7 +1406,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1440,7 +1440,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1491,7 +1491,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1508,7 +1508,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1525,7 +1525,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1576,7 +1576,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1593,7 +1593,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -1644,7 +1644,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -1710,7 +1710,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -1846,7 +1846,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2003,7 +2003,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2044,7 +2044,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2068,7 +2068,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2085,7 +2085,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2102,7 +2102,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2119,7 +2119,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2153,7 +2153,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2187,7 +2187,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2204,7 +2204,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2221,7 +2221,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2238,7 +2238,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2255,7 +2255,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2289,7 +2289,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2340,7 +2340,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2374,7 +2374,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2425,7 +2425,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -2442,7 +2442,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -2475,7 +2475,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -2768,7 +2768,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2826,7 +2826,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2843,7 +2843,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2860,7 +2860,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2894,7 +2894,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2928,7 +2928,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2945,7 +2945,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2962,7 +2962,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -2996,7 +2996,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3013,7 +3013,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3064,7 +3064,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3115,7 +3115,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3132,7 +3132,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3149,7 +3149,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3182,7 +3182,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3216,7 +3216,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3266,7 +3266,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3283,7 +3283,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3317,7 +3317,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3494,7 +3494,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(1024)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3668,7 +3668,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3685,7 +3685,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3702,7 +3702,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3735,7 +3735,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3752,7 +3752,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -3769,7 +3769,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3786,7 +3786,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3803,7 +3803,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3820,7 +3820,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3837,7 +3837,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3854,7 +3854,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3888,7 +3888,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -3973,7 +3973,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4007,7 +4007,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4041,7 +4041,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4075,7 +4075,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4092,7 +4092,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4109,7 +4109,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4126,7 +4126,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4143,7 +4143,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4160,7 +4160,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4177,7 +4177,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4194,7 +4194,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4211,7 +4211,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4228,7 +4228,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4245,7 +4245,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4279,7 +4279,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4296,7 +4296,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4354,7 +4354,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4371,7 +4371,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4405,7 +4405,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4422,7 +4422,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -4490,7 +4490,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4558,7 +4558,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4626,7 +4626,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4694,7 +4694,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4762,7 +4762,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4830,7 +4830,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4898,7 +4898,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4932,7 +4932,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -4966,7 +4966,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5000,7 +5000,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5034,7 +5034,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5085,7 +5085,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5102,7 +5102,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5119,7 +5119,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5170,7 +5170,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5187,7 +5187,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5204,7 +5204,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5238,7 +5238,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5255,7 +5255,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5272,7 +5272,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -5322,7 +5322,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5339,7 +5339,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -5356,7 +5356,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5414,7 +5414,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5431,7 +5431,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5448,7 +5448,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5465,7 +5465,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5482,7 +5482,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -5499,7 +5499,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5574,7 +5574,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -5608,7 +5608,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5649,7 +5649,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5775,7 +5775,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5816,7 +5816,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5833,7 +5833,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5867,7 +5867,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5884,7 +5884,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5901,7 +5901,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5918,7 +5918,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5935,7 +5935,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -5952,7 +5952,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -5985,7 +5985,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6002,7 +6002,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6019,7 +6019,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6111,7 +6111,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6128,7 +6128,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6145,7 +6145,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6162,7 +6162,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6179,7 +6179,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6237,7 +6237,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6261,7 +6261,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6295,7 +6295,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6329,7 +6329,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6445,7 +6445,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6479,7 +6479,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6513,7 +6513,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6530,7 +6530,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6547,7 +6547,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6564,7 +6564,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6581,7 +6581,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6598,7 +6598,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6615,7 +6615,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6648,7 +6648,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6665,7 +6665,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6706,7 +6706,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6740,7 +6740,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6805,7 +6805,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6838,7 +6838,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -6855,7 +6855,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6920,7 +6920,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6954,7 +6954,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -6995,7 +6995,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7028,7 +7028,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7079,7 +7079,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7096,7 +7096,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7147,7 +7147,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7239,7 +7239,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7273,7 +7273,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7331,7 +7331,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7365,7 +7365,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7382,7 +7382,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7399,7 +7399,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7433,7 +7433,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7450,7 +7450,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7467,7 +7467,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7484,7 +7484,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7501,7 +7501,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7518,7 +7518,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7569,7 +7569,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7586,7 +7586,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7603,7 +7603,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7660,7 +7660,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7745,7 +7745,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7762,7 +7762,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7779,7 +7779,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7796,7 +7796,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7813,7 +7813,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7830,7 +7830,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(100)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7847,7 +7847,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7880,7 +7880,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7931,7 +7931,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -7948,7 +7948,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -7989,7 +7989,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8022,7 +8022,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8073,7 +8073,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8090,7 +8090,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8107,7 +8107,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8148,7 +8148,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8181,7 +8181,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8198,7 +8198,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8231,7 +8231,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8306,7 +8306,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8347,7 +8347,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8381,7 +8381,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8414,7 +8414,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8472,7 +8472,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8513,7 +8513,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8530,7 +8530,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8547,7 +8547,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8564,7 +8564,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8581,7 +8581,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8598,7 +8598,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8615,7 +8615,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8665,7 +8665,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8682,7 +8682,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8723,7 +8723,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8756,7 +8756,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -8882,7 +8882,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8899,7 +8899,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8916,7 +8916,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8933,7 +8933,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8967,7 +8967,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -8984,7 +8984,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9001,7 +9001,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9018,7 +9018,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9052,7 +9052,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9069,7 +9069,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9154,7 +9154,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9171,7 +9171,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9204,7 +9204,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9272,7 +9272,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9306,7 +9306,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9357,7 +9357,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9408,7 +9408,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9425,7 +9425,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9475,7 +9475,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9597,7 +9597,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9614,7 +9614,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9647,7 +9647,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9681,7 +9681,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9698,7 +9698,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9749,7 +9749,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9783,7 +9783,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9800,7 +9800,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9817,7 +9817,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9834,7 +9834,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -9867,7 +9867,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9884,7 +9884,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9901,7 +9901,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -9969,7 +9969,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(36)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -10104,7 +10104,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -10138,7 +10138,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10220,7 +10220,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'CHAR(64)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -10237,7 +10237,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10566,7 +10566,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10623,7 +10623,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10680,7 +10680,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10851,7 +10851,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10959,7 +10959,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -10976,7 +10976,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11010,7 +11010,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11067,7 +11067,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11124,7 +11124,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11141,7 +11141,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'MEDIUMTEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11232,7 +11232,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11249,7 +11249,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11453,7 +11453,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -11470,7 +11470,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11527,7 +11527,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11618,7 +11618,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11635,7 +11635,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11685,7 +11685,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -11736,7 +11736,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11884,7 +11884,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11901,7 +11901,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -11951,7 +11951,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'VARCHAR(255)',
 					'default' => '',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => true,
 				],
@@ -12123,7 +12123,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
@@ -12140,7 +12140,7 @@ final class Table extends BaseTable implements Tableinterface
 				'db' => [
 					'type' => 'TEXT',
 					'default' => 'EMPTY',
-					'null_switch' => 'NOT NULL',
+					'null_switch' => 'NULL',
 					'unique_key' => false,
 					'key' => false,
 				],
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php
new file mode 100644
index 000000000..f8dc8f63b
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/DateHelper.php
@@ -0,0 +1,294 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2020
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Utilities;
+
+
+/**
+ * Simple Date Helper
+ * 
+ * @since  5.0.2
+ */
+abstract class DateHelper
+{
+	/**
+	 * Convert a date to a human-readable fancy format (e.g., "1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted date.
+	 * @since 3.0.0
+	 */
+	public static function fancyDate($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('jS \o\f F Y', $date);
+	}
+
+	/**
+	 * Get a formatted date based on the time period (dynamic format based on age of the date).
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted date.
+	 * @since 3.0.0
+	 */
+	public static function fancyDynamicDate($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		// If older than a year, use m/d/y format.
+		if (date('Y', $date) < date('Y', strtotime('-1 year')))
+		{
+			return date('m/d/y', $date);
+		}
+
+		// If it's the same day, return the time.
+		if ($date > strtotime('-1 day'))
+		{
+			return date('g:i A', $date);
+		}
+
+		// Otherwise, return the month and day.
+		return date('M j', $date);
+	}
+
+	/**
+	 * Convert a date to a human-readable day, time, and date format (e.g., "Mon 12am 1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted day, time, and date.
+	 * @since 3.0.0
+	 */
+	public static function fancyDayTimeDate($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('D gA jS \o\f F Y', $date);
+	}
+
+	/**
+	 * Convert a date to a human-readable time and date format (e.g., "(12:00) 1st of January 2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted time and date.
+	 * @since 3.0.0
+	 */
+	public static function fancyDateTime($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('(G:i) jS \o\f F Y', $time);
+	}
+
+	/**
+	 * Convert a time to a human-readable format (e.g., "12:00").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Formatted time.
+	 * @since 3.0.0
+	 */
+	public static function fancyTime($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('G:i', $date);
+	}
+
+	/**
+	 * Convert a date to the day name (e.g., "Sunday").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day name.
+	 * @since 3.0.0
+	 */
+	public static function setDayName($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('l', $date);
+	}
+
+	/**
+	 * Convert a date to the month name (e.g., "January").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Month name.
+	 * @since 3.0.0
+	 */
+	public static function setMonthName($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('F', $date);
+	}
+
+	/**
+	 * Convert a date to the day with suffix (e.g., "1st").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day with suffix.
+	 * @since 3.0.0
+	 */
+	public static function setDay($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('jS', $date);
+	}
+
+	/**
+	 * Convert a date to the numeric month (e.g., "5").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Numeric month.
+	 * @since 3.0.0
+	 */
+	public static function setMonth($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('n', $date);
+	}
+
+	/**
+	 * Convert a date to the full year (e.g., "2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Full year.
+	 * @since 3.0.0
+	 */
+	public static function setYear($date, bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('Y', $date);
+	}
+
+	/**
+	 * Convert a date to a year/month format (e.g., "2024/05").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Year/Month format.
+	 * @since 3.0.0
+	 */
+	public static function setYearMonth($date, string $spacer = '/', bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('Y' . $spacer . 'm', $date);
+	}
+
+	/**
+	 * Convert a date to a year/month/day format (e.g., "2024/05/03").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Year/Month/Day format.
+	 * @since 3.0.0
+	 */
+	public static function setYearMonthDay($date, string $spacer = '/', bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('Y' . $spacer . 'm' . $spacer . 'd', $date);
+	}
+
+	/**
+	 * Convert a date to a day/month/year format (e.g., "03/05/2024").
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param string      $spacer       The spacer between year and month.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return string Day/Month/Year format.
+	 * @since 3.0.0
+	 */
+	public static function setDayMonthYear($date, string $spacer = '/', bool $checkStamp = true): string
+	{
+		$date = static::getValidTimestamp($date, $checkStamp);
+
+		return date('d' . $spacer . 'm' . $spacer . 'Y', $date);
+	}
+
+	/**
+	 * Convert a date string to a valid timestamp.
+	 *
+	 * @param string|int  $date         The date as a string or timestamp.
+	 * @param bool        $checkStamp   Whether to check if the input is a timestamp.
+	 *
+	 * @return int The valid timestamp.
+	 * @since 3.0.0
+	 */
+	public static function getValidTimestamp($date, bool $checkStamp): int
+	{
+		if ($checkStamp && !static::isValidTimeStamp($date))
+		{
+			$date = strtotime($date ?? 'Now');
+		}
+
+		return (int) $date;
+	}
+
+	/**
+	 * Check if the input is a valid Unix timestamp.
+	 *
+	 * @param mixed $timestamp The timestamp to validate.
+	 *
+	 * @return bool True if valid timestamp, false otherwise.
+	 * @since 3.0.0
+	 */
+	public static function isValidTimeStamp($timestamp): bool
+	{
+		return (is_numeric($timestamp) && (int) $timestamp == $timestamp && $timestamp > 0);
+	}
+
+	/**
+	 * Check if a string is a valid date according to the specified format.
+	 *
+	 * @param string $date The date string to validate.
+	 * @param string $format The format to check against (default is 'Y-m-d H:i:s').
+	 *
+	 * @return bool True if valid date, false otherwise.
+	 * @since 3.0.0
+	 */
+	public static function isValidateDate($date, string $format = 'Y-m-d H:i:s'): bool
+	{
+		$d = \DateTime::createFromFormat($format, $date);
+
+		return $d && $d->format($format) === $date;
+	}
+}
+
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php
new file mode 100644
index 000000000..5cdf483ee
--- /dev/null
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Utilities/SessionHelper.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2020
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Utilities;
+
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Session\Session;
+
+
+/**
+ * Simple Session
+ * 
+ * @since  5.0.2
+ */
+abstract class SessionHelper
+{
+	/**
+	 * The active session
+	 *
+	 * @var Session|null
+	 * @since 5.0.2
+	 */
+	private static ?Session $session = null;
+
+	/**
+	 * Get the active session
+	 *
+	 * @return Session
+	 * @throws \RuntimeException if the session cannot be loaded
+	 * @since 5.0.2
+	 */
+	public static function session(): Session
+	{
+		if (static::$session === null)
+		{
+			try {
+				static::$session = Factory::getApplication()->getSession();
+			} catch (\Exception $e) {
+				// Rethrow the exception as a RuntimeException to propagate it downstream
+				throw new \RuntimeException('Unable to load the session.', 0, $e);
+			}
+		}
+
+		return static::$session;
+	}
+
+	/**
+	 * Get data from the session store
+	 *
+	 * @param string $name     Name of a variable
+	 * @param mixed  $default  Default value of a variable if not set
+	 *
+	 * @return mixed Value of the variable from the session
+	 * @since 5.0.2
+	 */
+	public static function get(string $name, $default = null)
+	{
+		$value = static::session()->get($name, $default);
+
+		// Ensure the value is set in the session even if it was default
+		static::set($name, $value);
+
+		return $value;
+	}
+
+	/**
+	 * Set data into the session store
+	 *
+	 * @param string $name   Name of a variable
+	 * @param mixed  $value  Value of a variable
+	 *
+	 * @return mixed Old value of the variable
+	 * @since 5.0.2
+	 */
+	public static function set(string $name, $value = null)
+	{
+		return static::session()->set($name, $value);
+	}
+}
+