diff --git a/componentbuilderpowersautoloadercompiler.php b/componentbuilderpowersautoloadercompiler.php
index fe0ac1f..f88e395 100644
--- a/componentbuilderpowersautoloadercompiler.php
+++ b/componentbuilderpowersautoloadercompiler.php
@@ -12,17 +12,15 @@
 // 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\Factory;
 use Joomla\CMS\Language\Text;
 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\Componentbuilder\Compiler\Factory as CompilerFactory;
-
-JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/com_componentbuilder/helpers/componentbuilder.php');
-
-use VDM\Joomla\Componentbuilder\Compiler\Factory as CFactory;
 
 /**
  * Extension - Componentbuilder Powers Autoloader Compiler plugin.
@@ -107,7 +105,7 @@ class PlgExtensionComponentbuilderPowersAutoloaderCompiler extends CMSPlugin
 		// only check if there are active
 		if (ArrayHelper::check($this->componentsActive))
 		{
-			return in_array((int) CompilerFactory::_('Config')->component_id, $this->componentsActive);
+			return in_array((int) CFactory::_('Config')->component_id, $this->componentsActive);
 		}
 		return false;
 	}
diff --git a/componentbuilderpowersautoloadercompiler.xml b/componentbuilderpowersautoloadercompiler.xml
index 159c0b4..5859e23 100644
--- a/componentbuilderpowersautoloadercompiler.xml
+++ b/componentbuilderpowersautoloadercompiler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="3.10" group="extension" method="upgrade">
 	<name>PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER</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>
@@ -17,6 +17,8 @@
 	<languages folder="language">
 		<language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.ini</language>
 		<language tag="en-GB">en-GB/en-GB.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.ini</language>
+		<language tag="af-ZA">af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini</language>
 	</languages>
 
 	<!-- Plugin files -->
@@ -28,14 +30,10 @@
 		<folder>rules</folder>
 	</files>
 
-	<!-- Config parameter -->
+	<!-- Config parameters -->
 	<config>
 	<fields name="params">
-	<!-- default paths of basic fieldset points to the plugin -->
-	<fieldset name="basic" label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER"
-		addrulepath="/plugins/extension/componentbuilderpowersautoloadercompiler/rules"
-		addfieldpath="/plugins/extension/componentbuilderpowersautoloadercompiler/fields"
-	>
+	<fieldset name="basic" label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_GLOBAL_AUTOLOADER">
 		<!-- Note_select_power_plugin Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_select_power_plugin" label="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_LABEL" description="PLG_EXTENSION_COMPONENTBUILDERPOWERSAUTOLOADERCOMPILER_NOTE_SELECT_POWER_PLUGIN_DESCRIPTION" heading="h4" class="alert alert-info note_select_power_plugin" />
 		<!-- Plugin Field. Type: Joomlaplugins. (custom) -->
diff --git a/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.ini b/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.ini
new file mode 100644
index 0000000..3f17087
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.ini
@@ -0,0 +1,18 @@
+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"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_NO="Nee"
\ No newline at end of file
diff --git a/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini b/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini
new file mode 100644
index 0000000..3f17087
--- /dev/null
+++ b/language/af-ZA/af-ZA.plg_extension_componentbuilderpowersautoloadercompiler.sys.ini
@@ -0,0 +1,18 @@
+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"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTDASHBOARDHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCUSTOMADMINHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERSITEHEADERSTABS_NO="Nee"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_YES="Ja"
+PLG_CONTENT_COMPONENTBUILDERCOMPONENTHEADERSTABS_NO="Nee"
\ No newline at end of file