diff --git a/componentbuilderheaderscompiler.php b/componentbuilderheaderscompiler.php
index ad306e9..2c085f9 100644
--- a/componentbuilderheaderscompiler.php
+++ b/componentbuilderheaderscompiler.php
@@ -12,23 +12,22 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
+
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Registry\Registry;
+use Joomla\Registry\Registry;
+use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
 use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Utilities\JsonHelper;
 use VDM\Joomla\Utilities\StringHelper;
-use VDM\Joomla\Utilities\String\NamespaceHelper;
-
-JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
+use VDM\Joomla\Utilities\String\NamespaceHelper;
 
 /**
  * Extension - Componentbuilder Headers Compiler plugin.
  *
  * @package   ComponentbuilderHeadersCompiler
- * @since     2.3.0
+ * @since     2.3.1
  */
 class PlgExtensionComponentbuilderHeadersCompiler extends CMSPlugin
 {
diff --git a/componentbuilderheaderscompiler.xml b/componentbuilderheaderscompiler.xml
index 7065e66..3d839f9 100644
--- a/componentbuilderheaderscompiler.xml
+++ b/componentbuilderheaderscompiler.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="3.10" group="extension" method="upgrade">
 	<name>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER</name>
-	<creationDate>27th July, 2024</creationDate>
+	<creationDate>14th August, 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.3.0</version>
+	<version>2.3.1</version>
 	<description>PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
@@ -17,6 +17,8 @@
 	<languages folder="language">
 		<language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini</language>
 		<language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
diff --git a/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.ini b/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.ini
new file mode 100644
index 0000000..66bfa92
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.ini
@@ -0,0 +1,8 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee"
\ No newline at end of file
diff --git a/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.sys.ini b/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.sys.ini
new file mode 100644
index 0000000..66bfa92
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_extension_componentbuilderheaderscompiler.sys.ini
@@ -0,0 +1,8 @@
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_NO="Nee"
+PLG_EXTENSION_COMPONENTBUILDEREXPORTCOMPILER_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_NO="Nee"
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
index c77cce5..a501fe8 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.ini
@@ -1,3 +1,3 @@
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Headers Compiler"
 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.2.3.0)</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='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.3.1)</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='https://dev.vdm.io' 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 c77cce5..a501fe8 100644
--- a/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
+++ b/language/en-GB/en-GB.plg_extension_componentbuilderheaderscompiler.sys.ini
@@ -1,3 +1,3 @@
 PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER="Extension - Componentbuilder Headers Compiler"
 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.2.3.0)</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='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file
+PLG_EXTENSION_COMPONENTBUILDERHEADERSCOMPILER_XML_DESCRIPTION="<h1>Extension - Componentbuilder Headers Compiler (v.2.3.1)</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='https://dev.vdm.io' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 24th May, 2020</small></p>"
\ No newline at end of file