diff --git a/componentbuilderadminheaderstabs.php b/componentbuilderadminheaderstabs.php
index cd10fe7..a4bfc3f 100644
--- a/componentbuilderadminheaderstabs.php
+++ b/componentbuilderadminheaderstabs.php
@@ -13,22 +13,20 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Form\Form;
-use Joomla\CMS\Plugin\CMSPlugin;
-use VDM\Joomla\Utilities\ArrayHelper;
-
-JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php'); 
-
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Component\ComponentHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 /**
  * Content - Componentbuilder Admin Headers Tabs plugin.
  *
  * @package   ComponentbuilderAdminHeadersTabs
- * @since     2.0.3
+ * @since     3.0.0
  */
 class PlgContentComponentbuilderAdminHeadersTabs extends CMSPlugin
 {
 
 	/**
-	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 * Affects constructor behaviour. If true, language files will be loaded automatically.
 	 *
 	 * @var    boolean
 	 * @since  1.0
@@ -38,8 +36,8 @@ class PlgContentComponentbuilderAdminHeadersTabs extends CMSPlugin
 	/**
 	 * Runs on content preparation of form.
 	 *
-	 * @param   JForm     $form  The form
-	 * @param   stdClass  $data  The data
+	 * @param   Form     $form  The form
+	 * @param   \stdClass  $data  The data
 	 *
 	 * @return  boolean
 	 *
@@ -57,7 +55,7 @@ class PlgContentComponentbuilderAdminHeadersTabs extends CMSPlugin
 			// add the admin view params for privacy integration
 			$form->loadFile('admin_view');
 			// update all editors to use this components global editor
-			$global_editor = \JComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
+			$global_editor = ComponentHelper::getParams('com_componentbuilder')->get('editor', 'none');
 			// set the field editor value (with none as fallback)
 			$editors = $form->getXml()->xpath('descendant::fields[@name="admin_view_headers"]//field[@type="editor"]');
 			// check if we found any
diff --git a/componentbuilderadminheaderstabs.xml b/componentbuilderadminheaderstabs.xml
index 8b56b10..48c6114 100644
--- a/componentbuilderadminheaderstabs.xml
+++ b/componentbuilderadminheaderstabs.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="plugin" version="3.10" group="content" method="upgrade">
+<extension type="plugin" version="5.0" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS</name>
-	<creationDate>9th March, 2024</creationDate>
+	<creationDate>11th March, 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>2.0.3</version>
+	<version>3.0.0</version>
 	<description>PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
diff --git a/forms/admin_view.xml b/forms/admin_view.xml
index e1d69f4..38b2a25 100644
--- a/forms/admin_view.xml
+++ b/forms/admin_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- default paths of admin_view form points to componentbuilder -->
 <form
-	addrulepath="/administrator/components/com_componentbuilder/models/rules"
-	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
+	addruleprefix="VDM\Component\Componentbuilder\Administrator\Rule"
+	addfieldprefix="VDM\Component\Componentbuilder\Administrator\Field"
 >
 	<fields name="params">
 	<fieldset name="admin_view_headers" label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_CLASS_HEADERS">
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
index 69fc16c..9ed070a 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS="Content - Componentbuilder Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_DESCRIPTION="This plugin is used to set admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.2.0.3)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Yes"
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
index 69fc16c..9ed070a 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
@@ -1,6 +1,6 @@
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS="Content - Componentbuilder Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_DESCRIPTION="This plugin is used to set admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.2.0.3)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.3.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 10th March, 2024</small></p>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Yes"
diff --git a/script.php b/script.php
index bae514e..59f560a 100644
--- a/script.php
+++ b/script.php
@@ -24,341 +24,4 @@ use Joomla\CMS\Filesystem\Folder;
  */
 class plgContentComponentbuilderAdminHeadersTabsInstallerScript
 {
-
-	/**
-	 * Called before any type of action
-	 *
-	 * @param   string  $route  Which action is happening (install|uninstall|discover_install|update)
-	 * @param   Joomla\CMS\Installer\InstallerAdapter  $adapter  The object responsible for running this script
-	 *
-	 * @return  boolean  True on success
-	 */
-	public function preflight($route, $adapter)
-	{
-		// get application
-		$app = Factory::getApplication();
-
-		// the default for both install and update
-		$jversion = new JVersion();
-		if (!$jversion->isCompatible('3.8.0'))
-		{
-			$app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error');
-			return false;
-		}
-
-		if ('install' === $route)
-		{
-// needs fix
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.0.0 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 0 && $jcbVersion[2] >= 0) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 0) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-			// block install
-			$blockInstall = true;
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 2.10.13 or higher installed
-				if (count($jcbVersion) == 3 && (($jcbVersion[0] == 2 && $jcbVersion[1] >= 10 && (($jcbVersion[1] == 10 && $jcbVersion[2] >= 13) || ($jcbVersion[1] > 10))) || $jcbVersion[0] >= 3))
-				{
-					$blockInstall = false;
-				}
-			}
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB 2.10.13 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.0.0 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 0 && $jcbVersion[2] >= 0) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 0) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.0.0 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 0 && $jcbVersion[2] >= 0) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 0) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.0.0 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.1.18 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 1 && $jcbVersion[2] >= 18) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 1) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.1.18 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.0.14 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 0 && $jcbVersion[2] >= 14) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 0) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.0.14 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-
-
-			// check that componentbuilder is installed
-			$pathToCore = JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php';
-			if (!JFile::exists($pathToCore))
-			{
-				$app->enqueueMessage('Joomla Component Builder must first be installed from <a href="https://www.joomlacomponentbuilder.com/ " target="_blank">Joomla Component Builder</a>.', 'error');
-				return false;
-			}
-
-			// load the helper class
-			JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-			// block install
-			$blockInstall = true;
-
-			// check the version of JCB
-			$manifest = ComponentbuilderHelper::manifest();
-			if (isset($manifest->version) && strpos($manifest->version, '.') !== false)
-			{
-				// get the version
-				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 3.1.18 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 3 &&
-					(
-						($jcbVersion[0] == 3 && $jcbVersion[1] == 1 && $jcbVersion[2] >= 18) ||
-						($jcbVersion[0] == 3 && $jcbVersion[1] > 1) ||
-						$jcbVersion[0] > 3)
-					)
-				{
-					$blockInstall = false;
-				}
-			}
-
-			// allow install if all conditions are met
-			if ($blockInstall)
-			{
-				$app->enqueueMessage('Please upgrade to JCB v3.1.18 or higher before installing this plugin.', 'error');
-				return false;
-			}
-
-		}
-
-		return true;
-	}
 }