diff --git a/componentbuilderheaderscompiler.php b/componentbuilderheaderscompiler.php
index c433449..6a004af 100644
--- a/componentbuilderheaderscompiler.php
+++ b/componentbuilderheaderscompiler.php
@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,7 +22,7 @@ JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/c
  * Extension - Componentbuilder Headers Compiler plugin.
  *
  * @package   ComponentbuilderHeadersCompiler
- * @since     1.0.4
+ * @since     1.0.5
  */
 class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 {
@@ -46,76 +46,106 @@ class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 	 * The Targets
 	 *
 	 * @var    array
-	 * @since  1.0.4
+	 * @since  1.0.5
 	 */
 	protected $targets = array(
 		'admin_view_headers' =>
 			array(
-				'add_admin_view_controller'  => array(
-					'field'   => 'admin_view_controller',
-					'context' => 'admin.view.controller',
-					'view'    => 'name_single'
-				),
-				'add_admin_views_controller' => array(
-					'field'   => 'admin_views_controller',
-					'context' => 'admin.views.controller',
-					'view'    => 'name_list'
-				),
 				'add_admin_view_model'       => array(
 					'field'   => 'admin_view_model',
 					'context' => 'admin.view.model',
 					'view'    => 'name_single'
 				),
+				'add_admin_view'       => array(
+					'field'   => 'admin_view',
+					'context' => 'admin.view',
+					'view'    => 'name_single'
+				),
+				'add_admin_view_controller'  => array(
+					'field'   => 'admin_view_controller',
+					'context' => 'admin.view.controller',
+					'view'    => 'name_single'
+				),
 				'add_admin_views_model'      => array(
 					'field'   => 'admin_views_model',
 					'context' => 'admin.views.model',
 					'view'    => 'name_list'
+				),
+				'add_admin_views'      => array(
+					'field'   => 'admin_views',
+					'context' => 'admin.views',
+					'view'    => 'name_list'
+				),
+				'add_admin_views_controller' => array(
+					'field'   => 'admin_views_controller',
+					'context' => 'admin.views.controller',
+					'view'    => 'name_list'
 				)
 			),
 		'site_view_headers' =>
 			array(
-				'add_site_view_controller'  => array(
-					'field'   => 'site_view_controller',
-					'context' => 'site.view.controller',
-					'view'    => 'code'
-				),
-				'add_site_views_controller' => array(
-					'field'   => 'site_views_controller',
-					'context' => 'site.views.controller',
-					'view'    => 'code'
-				),
 				'add_site_view_model'       => array(
 					'field'   => 'site_view_model',
 					'context' => 'site.view.model',
 					'view'    => 'code'
 				),
+				'add_site_view'       => array(
+					'field'   => 'site_view',
+					'context' => 'site.view',
+					'view'    => 'code'
+				),
+				'add_site_view_controller'  => array(
+					'field'   => 'site_view_controller',
+					'context' => 'site.view.controller',
+					'view'    => 'code'
+				),
 				'add_site_views_model'      => array(
 					'field'   => 'site_views_model',
 					'context' => 'site.views.model',
 					'view'    => 'code'
+				),
+				'add_site_views'      => array(
+					'field'   => 'site_views',
+					'context' => 'site.views',
+					'view'    => 'code'
+				),
+				'add_site_views_controller' => array(
+					'field'   => 'site_views_controller',
+					'context' => 'site.views.controller',
+					'view'    => 'code'
 				)
 			),
 		'custom_admin_view_headers' =>
 			array(
-				'add_custom_admin_view_controller'  => array(
-					'field'   => 'custom_admin_view_controller',
-					'context' => 'custom.admin.view.controller',
-					'view'    => 'code'
-				),
-				'add_custom_admin_views_controller' => array(
-					'field'   => 'custom_admin_views_controller',
-					'context' => 'custom.admin.views.controller',
-					'view'    => 'code'
-				),
 				'add_custom_admin_view_model'       => array(
 					'field'   => 'custom_admin_view_model',
 					'context' => 'custom.admin.view.model',
 					'view'    => 'code'
 				),
+				'add_custom_admin_view'       => array(
+					'field'   => 'custom_admin_view',
+					'context' => 'custom.admin.view',
+					'view'    => 'code'
+				),
+				'add_custom_admin_view_controller'  => array(
+					'field'   => 'custom_admin_view_controller',
+					'context' => 'custom.admin.view.controller',
+					'view'    => 'code'
+				),
 				'add_custom_admin_views_model'      => array(
 					'field'   => 'custom_admin_views_model',
 					'context' => 'custom.admin.views.model',
 					'view'    => 'code'
+				),
+				'add_custom_admin_views'      => array(
+					'field'   => 'custom_admin_views',
+					'context' => 'custom.admin.views',
+					'view'    => 'code'
+				),
+				'add_custom_admin_views_controller' => array(
+					'field'   => 'custom_admin_views_controller',
+					'context' => 'custom.admin.views.controller',
+					'view'    => 'code'
 				)
 			),
 		'joomla_component_headers' =>
diff --git a/componentbuilderheaderscompiler.xml b/componentbuilderheaderscompiler.xml
index efb8522..8bccec3 100644
--- a/componentbuilderheaderscompiler.xml
+++ b/componentbuilderheaderscompiler.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="3.8" group="extension" method="upgrade">
 	<name>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER</name>
-	<creationDate>26th December, 2020</creationDate>
+	<creationDate>20th February, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-	<copyright>Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved.</copyright>
+	<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>1.0.4</version>
+	<version>1.0.5</version>
 	<description>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
index a342e21..b70002c 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Head
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers."
-PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.1.0.5)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
index a342e21..b70002c 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
@@ -2,6 +2,6 @@ PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Head
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_DESCRIPTION="This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers."
-PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.1.0.4)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.1.0.5)</h1> <div style='clear: both;'></div><p>This plugin is used to set the custom headers for your classes during compilation. To activate it you must first enable it here. Then open your JCB component global options, and under the Global tab, select this plugin in the Activate Compiler Plugins field.
 
 Also be sure to set your code where you would like to set Custom Headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file
diff --git a/script.php b/script.php
index be13077..44a5e4f 100644
--- a/script.php
+++ b/script.php
@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2021 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,8 +60,8 @@ class plgExtensionComponentbuilderHeadersCompilerInstallerScript
 			{
 				// get the version
 				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 2.12.4 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 2 && (($jcbVersion[1] == 12 && $jcbVersion[2] >= 4) || $jcbVersion[1] > 12))
+				// check that we have JCB 2.12.6 or higher installed
+				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 2 && (($jcbVersion[1] == 12 && $jcbVersion[2] >= 6) || $jcbVersion[1] > 12))
 				{
 					$blockInstall = false;
 				}
@@ -69,7 +69,7 @@ class plgExtensionComponentbuilderHeadersCompilerInstallerScript
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB 2.12.4 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB 2.12.6 or higher before installing this plugin.', 'error');
 				return false;
 			}
 		}