diff --git a/README.md b/README.md
index 419c33218..19ff4bbdb 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th October, 2020
++ *Last Build*: 21st October, 2020
 + *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 419c33218..19ff4bbdb 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,7 +144,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th October, 2020
++ *Last Build*: 21st October, 2020
 + *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/JModelAdmin.php
index 82b952d90..721ed76ed 100644
--- a/admin/compiler/joomla_3/JModelAdmin.php
+++ b/admin/compiler/joomla_3/JModelAdmin.php
@@ -17,9 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
-use Joomla\Utilities\ArrayHelper;
+###ADMIN_VIEW_MODEL_HEADER###
 
 /**
  * ###Component### ###View### Model
diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/JModelAdmin_site.php
index 82b952d90..852e9391f 100644
--- a/admin/compiler/joomla_3/JModelAdmin_site.php
+++ b/admin/compiler/joomla_3/JModelAdmin_site.php
@@ -17,9 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
-use Joomla\Utilities\ArrayHelper;
+###SITE_ADMIN_VIEW_MODEL_HEADER###
 
 /**
  * ###Component### ###View### Model
diff --git a/admin/compiler/joomla_3/JModelItem_custom_admin.php b/admin/compiler/joomla_3/JModelItem_custom_admin.php
index 494dd2087..33ecd7195 100644
--- a/admin/compiler/joomla_3/JModelItem_custom_admin.php
+++ b/admin/compiler/joomla_3/JModelItem_custom_admin.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Utilities\ArrayHelper;
+###CUSTOM_ADMIN_VIEW_MODEL_HEADER###
 
 /**
  * ###Component### ###SView### Model
diff --git a/admin/compiler/joomla_3/JModelItem_site.php b/admin/compiler/joomla_3/JModelItem_site.php
index dfa8d4ef1..efc5cc532 100644
--- a/admin/compiler/joomla_3/JModelItem_site.php
+++ b/admin/compiler/joomla_3/JModelItem_site.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Utilities\ArrayHelper;
+###SITE_VIEW_MODEL_HEADER###
 
 /**
  * ###Component### ###SView### Model
diff --git a/admin/compiler/joomla_3/JModelList.php b/admin/compiler/joomla_3/JModelList.php
index 1e55315b5..dda6a9d10 100644
--- a/admin/compiler/joomla_3/JModelList.php
+++ b/admin/compiler/joomla_3/JModelList.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Utilities\ArrayHelper;
+###ADMIN_VIEWS_MODEL_HEADER###
 
 /**
  * ###Views### Model
diff --git a/admin/compiler/joomla_3/JModelList_custom_admin.php b/admin/compiler/joomla_3/JModelList_custom_admin.php
index 3c1e96d4a..0a8cb794f 100644
--- a/admin/compiler/joomla_3/JModelList_custom_admin.php
+++ b/admin/compiler/joomla_3/JModelList_custom_admin.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Utilities\ArrayHelper;
+###CUSTOM_ADMIN_VIEWS_MODEL_HEADER###
 
 /**
  * ###Component### Model for ###SViews###
diff --git a/admin/compiler/joomla_3/JModelList_site.php b/admin/compiler/joomla_3/JModelList_site.php
index bbfeefed0..4b56de7ca 100644
--- a/admin/compiler/joomla_3/JModelList_site.php
+++ b/admin/compiler/joomla_3/JModelList_site.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Utilities\ArrayHelper;
+###SITE_VIEWS_MODEL_HEADER###
 
 /**
  * ###Component### Model for ###SViews###
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 4b7702aa4..d87aa30fa 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -6953,36 +6953,31 @@ class Interpretation extends Fields
 				$body[] = $this->setPlaceholders(
 					$view['settings']->default, $this->placeholders
 				);
-				// only load these if at-least one is not set via a custom placeholder
-				if (!$has_limitbox || !$has_pagescounter || !$has_pageslinks ||
-					!$has_pagination_start || !$has_pagination_end)
+				// add pagination start
+				if (!$has_pagination_start)
 				{
-					// add pagination start
-					if (!$has_pagination_start)
-					{
-						$body[] = $this->placeholders[$this->bbb . 'PAGINATIONSTART' . $this->ddd];
-					}
+					$body[] = $this->placeholders[$this->bbb . 'PAGINATIONSTART' . $this->ddd];
+				}
 
-					if (!$has_limitbox && !$has_pagescounter)
-					{
-						$body[] = $this->_t(3)
-							. '<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> <?php echo $this->pagination->getLimitBox(); ?></p>';
-					}
-					elseif (!$has_limitbox)
-					{
-						$body[] = $this->_t(3)
-							. '<p class="counter pull-right"> <?php echo $this->pagination->getLimitBox(); ?></p>';
-					}
-					elseif (!$has_pagescounter)
-					{
-						$body[] = $this->_t(3)
-							. '<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> </p>';
-					}
-					// add pagination end
-					if (!$has_pagination_end)
-					{
-						$body[] = $this->placeholders[$this->bbb . 'PAGINATIONEND' . $this->ddd];
-					}
+				if (!$has_limitbox && !$has_pagescounter)
+				{
+					$body[] = $this->_t(3)
+						. '<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> <?php echo $this->pagination->getLimitBox(); ?></p>';
+				}
+				elseif (!$has_limitbox)
+				{
+					$body[] = $this->_t(3)
+						. '<p class="counter pull-right"> <?php echo $this->pagination->getLimitBox(); ?></p>';
+				}
+				elseif (!$has_pagescounter)
+				{
+					$body[] = $this->_t(3)
+						. '<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> </p>';
+				}
+				// add pagination end
+				if (!$has_pagination_end)
+				{
+					$body[] = $this->placeholders[$this->bbb . 'PAGINATIONEND' . $this->ddd];
 				}
 				// lets clear the placeholders just in case
 				unset($this->placeholders[$this->bbb . 'LIMITBOX' . $this->ddd]);
@@ -20940,6 +20935,30 @@ class Interpretation extends Fields
 		return $script . $forEachStart . $fix;
 	}
 
+	public function setClassHeaders($context, $viewName)
+	{
+		// set the default
+		switch($context)
+		{
+			case 'admin.view.model':
+			case 'site.admin.view.model':
+				$header = 'use Joomla\Registry\Registry;';
+				$header .= PHP_EOL . 'use Joomla\String\StringHelper;';
+				$header .= PHP_EOL . 'use Joomla\Utilities\ArrayHelper;';
+				break;
+			default:
+				$header = 'use Joomla\Utilities\ArrayHelper;';
+				break;
+		}
+		// Trigger Event: jcb_ce_setClassHeader
+		$this->triggerEvent(
+			'jcb_ce_setClassHeader',
+			array(&$this->componentContext, &$context, &$viewName,
+			      &$header)
+		);
+		return $header;
+	}
+
 	protected function setModelFieldRelation($item, $viewName_list, $tab)
 	{
 		$fix = '';
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index fa2ea1d98..10cde3f16 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -614,6 +614,12 @@ class Infusion extends Interpretation
 								$viewName_single, $view
 							);
 						}
+						// SITE_ADMIN_VIEW_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+						$this->fileContentDynamic[$viewName_single][$this->hhh
+						. 'SITE_ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
+							= $this->setClassHeaders(
+							'site.admin.view.model', $viewName_single
+						);
 					}
 
 					// TABLAYOUTFIELDSARRAY <<<DYNAMIC>>> add the tab layout fields array to the model
@@ -621,6 +627,13 @@ class Infusion extends Interpretation
 					. 'TABLAYOUTFIELDSARRAY' . $this->hhh]
 						= $this->getTabLayoutFieldsArray($viewName_single);
 
+					// ADMIN_VIEW_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+					$this->fileContentDynamic[$viewName_single][$this->hhh
+					. 'ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
+						= $this->setClassHeaders(
+						'admin.view.model', $viewName_single
+					);
+
 					// Trigger Event: jcb_ce_onAfterBuildAdminEditViewContent
 					$this->triggerEvent(
 						'jcb_ce_onAfterBuildAdminEditViewContent',
@@ -896,6 +909,13 @@ class Infusion extends Interpretation
 							= '';
 					}
 
+					// ADMIN_VIEWS_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+					$this->fileContentDynamic[$viewName_list][$this->hhh
+					. 'ADMIN_VIEWS_MODEL_HEADER' . $this->hhh]
+						= $this->setClassHeaders(
+						'admin.views.model', $viewName_list
+					);
+
 					// Trigger Event: jcb_ce_onAfterBuildAdminListViewContent
 					$this->triggerEvent(
 						'jcb_ce_onAfterBuildAdminListViewContent',
@@ -1189,7 +1209,8 @@ class Infusion extends Interpretation
 					{
 						// HIDEMAINMENU <<<DYNAMIC>>>
 						$this->fileContentDynamic[$view['settings']->code][$this->hhh
-						. 'HIDEMAINMENU' . $this->hhh] = '';
+						. 'HIDEMAINMENU' . $this->hhh]
+							= '';
 					}
 					else
 					{
@@ -1322,6 +1343,26 @@ class Infusion extends Interpretation
 						$view['settings']->main_get->gettype, 2
 					);
 
+					// set headers based on the main get type
+					if ($view['settings']->main_get->gettype == 1)
+					{
+						// CUSTOM_ADMIN_VIEW_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+						$this->fileContentDynamic[$view['settings']->code][$this->hhh
+						. 'CUSTOM_ADMIN_VIEW_MODEL_HEADER' . $this->hhh]
+							= $this->setClassHeaders(
+							'custom.admin.view.model', $view['settings']->code
+						);
+					}
+					elseif ($view['settings']->main_get->gettype == 2)
+					{
+						// CUSTOM_ADMIN_VIEWS_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+						$this->fileContentDynamic[$view['settings']->code][$this->hhh
+						. 'CUSTOM_ADMIN_VIEWS_MODEL_HEADER' . $this->hhh]
+							= $this->setClassHeaders(
+							'custom.admin.views.model', $view['settings']->code
+						);
+					}
+
 					// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
 					$this->triggerEvent(
 						'jcb_ce_onAfterBuildCustomAdminViewContent',
@@ -1753,6 +1794,26 @@ class Infusion extends Interpretation
 						$view['settings']->main_get->gettype, 2
 					);
 
+					// set headers based on the main get type
+					if ($view['settings']->main_get->gettype == 1)
+					{
+						// SITE_VIEW_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+						$this->fileContentDynamic[$view['settings']->code][$this->hhh
+						. 'SITE_VIEW_MODEL_HEADER' . $this->hhh]
+							= $this->setClassHeaders(
+							'site.view.model', $view['settings']->code
+						);
+					}
+					elseif ($view['settings']->main_get->gettype == 2)
+					{
+						// SITE_VIEWS_MODEL_HEADER <<<DYNAMIC>>> add the header details for the model
+						$this->fileContentDynamic[$view['settings']->code][$this->hhh
+						. 'SITE_VIEWS_MODEL_HEADER' . $this->hhh]
+							= $this->setClassHeaders(
+							'site.views.model', $view['settings']->code
+						);
+					}
+
 					// Trigger Event: jcb_ce_onAfterBuildSiteViewContent
 					$this->triggerEvent(
 						'jcb_ce_onAfterBuildSiteViewContent',
diff --git a/admin/models/admin_custom_tabs.php b/admin/models/admin_custom_tabs.php
index 7d409ed04..46db0a6ea 100644
--- a/admin/models/admin_custom_tabs.php
+++ b/admin/models/admin_custom_tabs.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index 9b8950388..0ba7aecbe 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 4888089d9..13335b8f8 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index b24caee98..2f4afd85f 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index e2b24a9b5..505dc5e1b 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/class_extends.php b/admin/models/class_extends.php
index 7db99ecb3..d3d6dc08e 100644
--- a/admin/models/class_extends.php
+++ b/admin/models/class_extends.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/class_method.php b/admin/models/class_method.php
index 2c799658a..c26f82e7a 100644
--- a/admin/models/class_method.php
+++ b/admin/models/class_method.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/class_property.php b/admin/models/class_property.php
index a941e2352..ac938f905 100644
--- a/admin/models/class_property.php
+++ b/admin/models/class_property.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index f143c1c35..9d791f3fe 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index 04299cecd..282019d33 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index f8712d1a5..3d67ae12a 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index 47f3bbda9..3ffa87bc9 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index 3865edd3a..2b24ba9d3 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index ab6ecaaf0..bc4767e3c 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_modules.php b/admin/models/component_modules.php
index f4eddc292..1762ce1de 100644
--- a/admin/models/component_modules.php
+++ b/admin/models/component_modules.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index d22df0214..1e37e3e08 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_placeholders.php b/admin/models/component_placeholders.php
index 25d19ab67..6996f79f0 100644
--- a/admin/models/component_placeholders.php
+++ b/admin/models/component_placeholders.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_plugins.php b/admin/models/component_plugins.php
index bede27522..4d2def59b 100644
--- a/admin/models/component_plugins.php
+++ b/admin/models/component_plugins.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index 5640efaa6..072417ecb 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index 9464b3fe6..ad07631b6 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 91af2d657..49faff808 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index 25522e5a4..f8d0a7300 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index 76cfb7d75..82befb626 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/field.php b/admin/models/field.php
index cef6417a5..f95fc869c 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index c0e9c11ec..f303e90b1 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index ece45fb0a..478675d6c 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index c0f942fa4..1df6a579f 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_module.php b/admin/models/joomla_module.php
index f1e1bc0b2..ec041fa8f 100644
--- a/admin/models/joomla_module.php
+++ b/admin/models/joomla_module.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_module_files_folders_urls.php b/admin/models/joomla_module_files_folders_urls.php
index bf5900f23..1e93bdcd2 100644
--- a/admin/models/joomla_module_files_folders_urls.php
+++ b/admin/models/joomla_module_files_folders_urls.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_module_updates.php b/admin/models/joomla_module_updates.php
index 5017694b2..1078494d5 100644
--- a/admin/models/joomla_module_updates.php
+++ b/admin/models/joomla_module_updates.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_plugin.php b/admin/models/joomla_plugin.php
index 7819e6ca2..b580a54bd 100644
--- a/admin/models/joomla_plugin.php
+++ b/admin/models/joomla_plugin.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_plugin_files_folders_urls.php b/admin/models/joomla_plugin_files_folders_urls.php
index 604979e99..bfa70541e 100644
--- a/admin/models/joomla_plugin_files_folders_urls.php
+++ b/admin/models/joomla_plugin_files_folders_urls.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_plugin_group.php b/admin/models/joomla_plugin_group.php
index 073e0d5b0..a2e6e9d84 100644
--- a/admin/models/joomla_plugin_group.php
+++ b/admin/models/joomla_plugin_group.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/joomla_plugin_updates.php b/admin/models/joomla_plugin_updates.php
index 99e0f9abb..cb7596896 100644
--- a/admin/models/joomla_plugin_updates.php
+++ b/admin/models/joomla_plugin_updates.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/language.php b/admin/models/language.php
index 30eae43cc..1640d91e9 100644
--- a/admin/models/language.php
+++ b/admin/models/language.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 12d769f83..14f9e3429 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/layout.php b/admin/models/layout.php
index b2c856a64..6ba8d8177 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/library.php b/admin/models/library.php
index 5df64cb1c..779835d37 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/library_config.php b/admin/models/library_config.php
index 402068dd9..13a810d32 100644
--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php
index 5b00e37e0..861623900 100644
--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php
index 8d03bc4e2..dad39b78b 100644
--- a/admin/models/placeholder.php
+++ b/admin/models/placeholder.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/server.php b/admin/models/server.php
index 0008b8c83..dd6b3b2c9 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index 823a0a3dc..69ec8c57a 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index 56602624b..ed0f51073 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php
index c5966d875..ed37f229b 100644
--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/template.php b/admin/models/template.php
index 75a6f9507..e68d5748f 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php
index 008d98f40..99058b526 100644
--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@@ -12,8 +12,8 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-use Joomla\Registry\Registry;
-use Joomla\String\StringHelper;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 /**
diff --git a/componentbuilder.xml b/componentbuilder.xml
index a1a08dfc9..f15845e71 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>11th October, 2020</creationDate>
+	<creationDate>21st October, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>