diff --git a/README.md b/README.md
index 4e4c3ac..99ba63f 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,12 @@ This repository contains an index (see below) of all the approved powers within
 - **Namespace**: [VDM\Joomla\Componentbuilder\Interfaces](#vdm-joomla-componentbuilder-interfaces)
 
   - **interface Cryptinterface** | [Details](src/81de8f57-dd9c-4a17-964f-848cd4a0743b) | [Code](src/81de8f57-dd9c-4a17-964f-848cd4a0743b/code.php) | [Settings](src/81de8f57-dd9c-4a17-964f-848cd4a0743b/settings.json) | Super__81de8f57_dd9c_4a17_964f_848cd4a0743b__Power
-  - **interface GrepInterface** | [Details](src/c182506a-ab84-439c-b962-1e606b58d545) | [Code](src/c182506a-ab84-439c-b962-1e606b58d545/code.php) | [Settings](src/c182506a-ab84-439c-b962-1e606b58d545/settings.json) | Super__c182506a_ab84_439c_b962_1e606b58d545__Power
   - **interface Serverinterface** | [Details](src/86ac0760-26f5-4746-9c7f-ce77860f80f8) | [Code](src/86ac0760-26f5-4746-9c7f-ce77860f80f8/code.php) | [Settings](src/86ac0760-26f5-4746-9c7f-ce77860f80f8/settings.json) | Super__86ac0760_26f5_4746_9c7f_ce77860f80f8__Power
-  - **interface SuperInterface** | [Details](src/51de80f2-2868-4c2c-8198-ef79349e9bd7) | [Code](src/51de80f2-2868-4c2c-8198-ef79349e9bd7/code.php) | [Settings](src/51de80f2-2868-4c2c-8198-ef79349e9bd7/settings.json) | Super__51de80f2_2868_4c2c_8198_ef79349e9bd7__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\JoomlaPower](#vdm-joomla-componentbuilder-joomlapower)
 
   - **abstract class Factory** | [Details](src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400) | [Code](src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.php) | [Settings](src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/settings.json) | Super__6ee3dc9e_1949_4da5_a74f_d9eb7f14e400__Power
   - **final class Grep** | [Details](src/355bf21a-f859-4528-9110-bcd2c6d05ea7) | [Code](src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.php) | [Settings](src/355bf21a-f859-4528-9110-bcd2c6d05ea7/settings.json) | Super__355bf21a_f859_4528_9110_bcd2c6d05ea7__Power
+  - **final class Repository** | [Details](src/85cddb24-7ee6-4d86-a0db-615f443e1aec) | [Code](src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.php) | [Settings](src/85cddb24-7ee6-4d86-a0db-615f443e1aec/settings.json) | Super__85cddb24_7ee6_4d86_a0db_615f443e1aec__Power
   - **final class Super** | [Details](src/39a75870-a7f7-45fd-937d-5ba97b85b8ad) | [Code](src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/code.php) | [Settings](src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/settings.json) | Super__39a75870_a7f7_45fd_937d_5ba97b85b8ad__Power
   - **class Config** | [Details](src/0b821bba-7503-4448-90e7-f3c1bd51dfd6) | [Code](src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.php) | [Settings](src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/settings.json) | Super__0b821bba_7503_4448_90e7_f3c1bd51dfd6__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Power](#vdm-joomla-componentbuilder-power)
@@ -55,13 +54,15 @@ This repository contains an index (see below) of all the approved powers within
   - **abstract class Factory** | [Details](src/a5734b9e-a72d-494c-bc72-c3bc7506015f) | [Code](src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.php) | [Settings](src/a5734b9e-a72d-494c-bc72-c3bc7506015f/settings.json) | Super__a5734b9e_a72d_494c_bc72_c3bc7506015f__Power
   - **final class Generator** | [Details](src/505801ac-d3e2-44c6-a300-9a57a96170c6) | [Code](src/505801ac-d3e2-44c6-a300-9a57a96170c6/code.php) | [Settings](src/505801ac-d3e2-44c6-a300-9a57a96170c6/settings.json) | Super__505801ac_d3e2_44c6_a300_9a57a96170c6__Power
   - **final class Grep** | [Details](src/6784dd52-0909-451a-a872-9a942a023c68) | [Code](src/6784dd52-0909-451a-a872-9a942a023c68/code.php) | [Settings](src/6784dd52-0909-451a-a872-9a942a023c68/settings.json) | Super__6784dd52_0909_451a_a872_9a942a023c68__Power
+  - **final class Super** | [Details](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff) | [Code](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php) | [Settings](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json) | Super__3ab0eba9_f37b_4b37_aec1_2e78067f2aff__Power
   - **class Config** | [Details](src/be4ccfae-65a9-401e-bdbe-637d8c226954) | [Code](src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.php) | [Settings](src/be4ccfae-65a9-401e-bdbe-637d8c226954/settings.json) | Super__be4ccfae_65a9_401e_bdbe_637d8c226954__Power
-  - **class Super** | [Details](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff) | [Code](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php) | [Settings](src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json) | Super__3ab0eba9_f37b_4b37_aec1_2e78067f2aff__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Service](#vdm-joomla-componentbuilder-service)
 
   - **class CoreRules** | [Details](src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0) | [Code](src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/code.php) | [Settings](src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/settings.json) | Super__f65b52c2_593a_4c35_89d1_4a8e57a1adf0__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Utilities](#vdm-joomla-componentbuilder-utilities)
 
+  - **abstract class FilterHelper** | [Details](src/cddcac51-9a46-47c4-ba59-105c70453bd6) | [Code](src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.php) | [Settings](src/cddcac51-9a46-47c4-ba59-105c70453bd6/settings.json) | Super__cddcac51_9a46_47c4_ba59_105c70453bd6__Power
+  - **abstract class RepoHelper** | [Details](src/c6619b00-261c-473b-8094-d4fe9e6bab39) | [Code](src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.php) | [Settings](src/c6619b00-261c-473b-8094-d4fe9e6bab39/settings.json) | Super__c6619b00_261c_473b_8094_d4fe9e6bab39__Power
   - **class Constantpaths** | [Details](src/e0c8c931-52a0-4171-9909-e8769505bb1f) | [Code](src/e0c8c931-52a0-4171-9909-e8769505bb1f/code.php) | [Settings](src/e0c8c931-52a0-4171-9909-e8769505bb1f/settings.json) | Super__e0c8c931_52a0_4171_9909_e8769505bb1f__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Compiler\Adminview](#vdm-joomla-componentbuilder-compiler-adminview)
 
@@ -120,6 +121,7 @@ This repository contains an index (see below) of all the approved powers within
   - **final class JsonItemArray** | [Details](src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb) | [Code](src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/code.php) | [Settings](src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/settings.json) | Super__6b386f2e_3eb1_4f60_81af_a90c8da1ffeb__Power
   - **final class JsonString** | [Details](src/bb26cf63-69a5-4c43-b2df-43284c9d907d) | [Code](src/bb26cf63-69a5-4c43-b2df-43284c9d907d/code.php) | [Settings](src/bb26cf63-69a5-4c43-b2df-43284c9d907d/settings.json) | Super__bb26cf63_69a5_4c43_b2df_43284c9d907d__Power
   - **final class LanguageMessages** | [Details](src/44efa649-736d-4656-a0ec-e4f1653a6742) | [Code](src/44efa649-736d-4656-a0ec-e4f1653a6742/code.php) | [Settings](src/44efa649-736d-4656-a0ec-e4f1653a6742/settings.json) | Super__44efa649_736d_4656_a0ec_e4f1653a6742__Power
+  - **final class Languages** | [Details](src/7526a39a-ada3-4499-8d75-81beff33f949) | [Code](src/7526a39a-ada3-4499-8d75-81beff33f949/code.php) | [Settings](src/7526a39a-ada3-4499-8d75-81beff33f949/settings.json) | Super__7526a39a_ada3_4499_8d75_81beff33f949__Power
   - **final class Layout** | [Details](src/a90a2495-9c26-446c-867e-9ee8f42fb6af) | [Code](src/a90a2495-9c26-446c-867e-9ee8f42fb6af/code.php) | [Settings](src/a90a2495-9c26-446c-867e-9ee8f42fb6af/settings.json) | Super__a90a2495_9c26_446c_867e_9ee8f42fb6af__Power
   - **final class LayoutData** | [Details](src/7415fdb4-5719-40b7-b01f-05588e968b47) | [Code](src/7415fdb4-5719-40b7-b01f-05588e968b47/code.php) | [Settings](src/7415fdb4-5719-40b7-b01f-05588e968b47/settings.json) | Super__7415fdb4_5719_40b7_b01f_05588e968b47__Power
   - **final class LibraryManager** | [Details](src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8) | [Code](src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/code.php) | [Settings](src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/settings.json) | Super__e696927b_e8f4_4cfc_9d25_215db4e3c7a8__Power
@@ -385,29 +387,9 @@ This repository contains an index (see below) of all the approved powers within
   - **class Pathfix** | [Details](src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f) | [Code](src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/code.php) | [Settings](src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/settings.json) | Super__cdc9b06d_8333_4fa7_ab4d_b810dd90f95f__Power
   - **class Paths** | [Details](src/6f20369a-8536-4870-a1a3-cda254c939c8) | [Code](src/6f20369a-8536-4870-a1a3-cda254c939c8/code.php) | [Settings](src/6f20369a-8536-4870-a1a3-cda254c939c8/settings.json) | Super__6f20369a_8536_4870_a1a3_cda254c939c8__Power
   - **class Structure** | [Details](src/1efdded5-d6c8-452c-8f37-0374483a7b3f) | [Code](src/1efdded5-d6c8-452c-8f37-0374483a7b3f/code.php) | [Settings](src/1efdded5-d6c8-452c-8f37-0374483a7b3f/settings.json) | Super__1efdded5_d6c8_452c_8f37_0374483a7b3f__Power
-- **Namespace**: [VDM\Joomla\Componentbuilder\Interfaces\Database](#vdm-joomla-componentbuilder-interfaces-database)
-
-  - **interface InsertInterface** | [Details](src/95c02df3-fe0a-405b-b506-b7a5b8605b66) | [Code](src/95c02df3-fe0a-405b-b506-b7a5b8605b66/code.php) | [Settings](src/95c02df3-fe0a-405b-b506-b7a5b8605b66/settings.json) | Super__95c02df3_fe0a_405b_b506_b7a5b8605b66__Power
-  - **interface UpdateInterface** | [Details](src/69c29be3-ab25-4f56-944e-7ada6307b10c) | [Code](src/69c29be3-ab25-4f56-944e-7ada6307b10c/code.php) | [Settings](src/69c29be3-ab25-4f56-944e-7ada6307b10c/settings.json) | Super__69c29be3_ab25_4f56_944e_7ada6307b10c__Power
-- **Namespace**: [VDM\Joomla\Componentbuilder\JoomlaPower\Database](#vdm-joomla-componentbuilder-joomlapower-database)
-
-  - **final class Insert** | [Details](src/9d53d45e-9b4d-45ec-827b-4916b91c907e) | [Code](src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.php) | [Settings](src/9d53d45e-9b4d-45ec-827b-4916b91c907e/settings.json) | Super__9d53d45e_9b4d_45ec_827b_4916b91c907e__Power
-  - **final class Load** | [Details](src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a) | [Code](src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/code.php) | [Settings](src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/settings.json) | Super__b4ea5de3_653f_43f9_b927_4ba6456b4d0a__Power
-  - **final class Update** | [Details](src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b) | [Code](src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/code.php) | [Settings](src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/settings.json) | Super__679473f6_3ea2_49d5_8273_1b29c8f0ad2b__Power
-- **Namespace**: [VDM\Joomla\Componentbuilder\JoomlaPower\Model](#vdm-joomla-componentbuilder-joomlapower-model)
-
-  - **final class Load** | [Details](src/05744dd3-4030-4cf8-8dda-a93ab809b473) | [Code](src/05744dd3-4030-4cf8-8dda-a93ab809b473/code.php) | [Settings](src/05744dd3-4030-4cf8-8dda-a93ab809b473/settings.json) | Super__05744dd3_4030_4cf8_8dda_a93ab809b473__Power
-  - **final class Upsert** | [Details](src/9206082e-a3f7-472e-98b2-de90d06cbdcd) | [Code](src/9206082e-a3f7-472e-98b2-de90d06cbdcd/code.php) | [Settings](src/9206082e-a3f7-472e-98b2-de90d06cbdcd/settings.json) | Super__9206082e_a3f7_472e_98b2_de90d06cbdcd__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\JoomlaPower\Service](#vdm-joomla-componentbuilder-joomlapower-service)
 
-  - **class Database** | [Details](src/a2992a91-eec2-4957-811b-8cde22aa1438) | [Code](src/a2992a91-eec2-4957-811b-8cde22aa1438/code.php) | [Settings](src/a2992a91-eec2-4957-811b-8cde22aa1438/settings.json) | Super__a2992a91_eec2_4957_811b_8cde22aa1438__Power
   - **class JoomlaPower** | [Details](src/38e1ca3e-1908-459a-be87-9f83b292058f) | [Code](src/38e1ca3e-1908-459a-be87-9f83b292058f/code.php) | [Settings](src/38e1ca3e-1908-459a-be87-9f83b292058f/settings.json) | Super__38e1ca3e_1908_459a_be87_9f83b292058f__Power
-- **Namespace**: [VDM\Joomla\Componentbuilder\Power\Database](#vdm-joomla-componentbuilder-power-database)
-
-  - **interface LoadInterface** | [Details](src/99786f53-64b7-4d52-95b0-5306e7386c3f) | [Code](src/99786f53-64b7-4d52-95b0-5306e7386c3f/code.php) | [Settings](src/99786f53-64b7-4d52-95b0-5306e7386c3f/settings.json) | Super__99786f53_64b7_4d52_95b0_5306e7386c3f__Power
-  - **class Insert** | [Details](src/380bb7a3-cdcc-4336-a699-5070cbf521a5) | [Code](src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.php) | [Settings](src/380bb7a3-cdcc-4336-a699-5070cbf521a5/settings.json) | Super__380bb7a3_cdcc_4336_a699_5070cbf521a5__Power
-  - **class Load** | [Details](src/1f86db0f-e271-45df-8795-3e503ec76698) | [Code](src/1f86db0f-e271-45df-8795-3e503ec76698/code.php) | [Settings](src/1f86db0f-e271-45df-8795-3e503ec76698/settings.json) | Super__1f86db0f_e271_45df_8795_3e503ec76698__Power
-  - **class Update** | [Details](src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3) | [Code](src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.php) | [Settings](src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/settings.json) | Super__e543c123_b1d9_4a0b_83b2_a9d371da5ff3__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Power\Generator](#vdm-joomla-componentbuilder-power-generator)
 
   - **final class Bucket** | [Details](src/5d4278f0-7db2-498f-872a-c974bd8ce334) | [Code](src/5d4278f0-7db2-498f-872a-c974bd8ce334/code.php) | [Settings](src/5d4278f0-7db2-498f-872a-c974bd8ce334/settings.json) | Super__5d4278f0_7db2_498f_872a_c974bd8ce334__Power
@@ -416,13 +398,8 @@ This repository contains an index (see below) of all the approved powers within
   - **final class Search** | [Details](src/50302fce-62b4-48ae-a692-9cc4595ce74c) | [Code](src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.php) | [Settings](src/50302fce-62b4-48ae-a692-9cc4595ce74c/settings.json) | Super__50302fce_62b4_48ae_a692_9cc4595ce74c__Power
   - **final class ServiceProvider** | [Details](src/369ae3f5-90db-43b9-aba9-ce5c83311c4e) | [Code](src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/code.php) | [Settings](src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/settings.json) | Super__369ae3f5_90db_43b9_aba9_ce5c83311c4e__Power
   - **final class ServiceProviderBuilder** | [Details](src/8a2a3ee5-6ce2-4604-91e2-01f770228960) | [Code](src/8a2a3ee5-6ce2-4604-91e2-01f770228960/code.php) | [Settings](src/8a2a3ee5-6ce2-4604-91e2-01f770228960/settings.json) | Super__8a2a3ee5_6ce2_4604_91e2_01f770228960__Power
-- **Namespace**: [VDM\Joomla\Componentbuilder\Power\Model](#vdm-joomla-componentbuilder-power-model)
-
-  - **class Load** | [Details](src/bb29a833-73f7-4283-9327-bc7e41f0723b) | [Code](src/bb29a833-73f7-4283-9327-bc7e41f0723b/code.php) | [Settings](src/bb29a833-73f7-4283-9327-bc7e41f0723b/settings.json) | Super__bb29a833_73f7_4283_9327_bc7e41f0723b__Power
-  - **class Upsert** | [Details](src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5) | [Code](src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php) | [Settings](src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json) | Super__7c1fb50f_8fb1_4627_8705_6fedf7182ca5__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Power\Service](#vdm-joomla-componentbuilder-power-service)
 
-  - **class Database** | [Details](src/7243aaf6-b76c-4391-8698-50abbfc98fbe) | [Code](src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.php) | [Settings](src/7243aaf6-b76c-4391-8698-50abbfc98fbe/settings.json) | Super__7243aaf6_b76c_4391_8698_50abbfc98fbe__Power
   - **class Generator** | [Details](src/a7101bbc-3c81-4b52-a4aa-522291f7594b) | [Code](src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.php) | [Settings](src/a7101bbc-3c81-4b52-a4aa-522291f7594b/settings.json) | Super__a7101bbc_3c81_4b52_a4aa_522291f7594b__Power
   - **class Gitea** | [Details](src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae) | [Code](src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/code.php) | [Settings](src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/settings.json) | Super__510dc0f6_da3f_4a78_b43d_3a03e2cb5fae__Power
   - **class Power** | [Details](src/02bc072b-1e89-46c1-9732-4da77b1a9ac9) | [Code](src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.php) | [Settings](src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/settings.json) | Super__02bc072b_1e89_46c1_9732_4da77b1a9ac9__Power
diff --git a/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/README.md b/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/README.md
index 6acf6a9..10128ca 100644
--- a/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/README.md
+++ b/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowAdd (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFive\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowAdd << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/settings.json b/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/settings.json
index d9920eb..89ecdf3 100644
--- a/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/settings.json
+++ b/src/005fce79-1b62-4a93-8d5e-8c89fee1afc6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "005fce79-1b62-4a93-8d5e-8c89fee1afc6",
     "implements": [
         "c9700450-4f44-4455-bc86-6a7660daadee"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Controller.AllowAdd",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Controller.AllowAdd",
     "description": "Controller Allow Add Class for Joomla 5\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/007177eb-d39d-4093-8840-07a38811c502/code.php b/src/007177eb-d39d-4093-8840-07a38811c502/code.php
index ba22815..f88360e 100644
--- a/src/007177eb-d39d-4093-8840-07a38811c502/code.php
+++ b/src/007177eb-d39d-4093-8840-07a38811c502/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/007177eb-d39d-4093-8840-07a38811c502/settings.json b/src/007177eb-d39d-4093-8840-07a38811c502/settings.json
index 5d32673..abd3dd8 100644
--- a/src/007177eb-d39d-4093-8840-07a38811c502/settings.json
+++ b/src/007177eb-d39d-4093-8840-07a38811c502/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Category",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Category",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Category",
     "description": "Category Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/README.md b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/README.md
index 5809f36..d6bdae8 100644
--- a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/README.md
+++ b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/README.md
@@ -8,6 +8,7 @@
 ```
 # class Extractor (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class Extractor  #Gold {
diff --git a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/code.php b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/code.php
index 59a0c33..0ef7008 100644
--- a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/code.php
+++ b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/code.php
@@ -18,8 +18,8 @@ use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Version;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
diff --git a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/settings.json b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/settings.json
index 7c5da15..3c90d6c 100644
--- a/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/settings.json
+++ b/src/01411bb1-fdd6-4cca-84d7-1b62d93c70c1/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "01411bb1-fdd6-4cca-84d7-1b62d93c70c1",
     "implements": [
         "6da2afa5-6087-46dd-80a0-74c6434bcb18"
@@ -53,7 +53,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.Extractor",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.Extractor",
     "description": "Compiler Custom Code Extractor\r\n\r\nThe custom script placeholders - we use the (xxx) to avoid detection it should be (***)\r\n##################################--->  PHP\/JS  ---####################################\r\n\r\nNew Insert Code        = \/xxx[INSERT>$$$$]xxx\/                \/xxx[\/INSERT>$$$$]xxx\/\r\nNew Replace Code    = \/xxx[REPLACE>$$$$]xxx\/               \/xxx[\/REPLACE>$$$$]xxx\/\r\n\r\n\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/ when JCB adds it back \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\nJCB Add Inserted Code    = \/xxx[INSERTED$$$$]xxx\/\/xx23xx\/          \/xxx[\/INSERTED$$$$]xxx\/\r\nJCB Add Replaced Code    = \/xxx[REPLACED$$$$]xxx\/\/xx25xx\/          \/xxx[\/REPLACED$$$$]xxx\/\r\n\r\n\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/ changeing existing custom code \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\nUpdate Inserted Code    = \/xxx[INSERTED>$$$$]xxx\/\/xx23xx\/        \/xxx[\/INSERTED>$$$$]xxx\/\r\nUpdate Replaced Code    = \/xxx[REPLACED>$$$$]xxx\/\/xx25xx\/        \/xxx[\/REPLACED>$$$$]xxx\/\r\n\r\nThe custom script placeholders - we use the (==) to avoid detection it should be (--)\r\n###################################--->  HTML  ---#####################################\r\n\r\nNew Insert Code        = !==[INSERT>$$$$]==>                 !==[\/INSERT>$$$$]==>\r\nNew Replace Code    = !==[REPLACE>$$$$]==>                !==[\/REPLACE>$$$$]==>\r\n\r\n\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/ when JCB adds it back \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\nJCB Add Inserted Code    =         \r\nJCB Add Replaced Code    =         \r\n\r\n\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/ changeing existing custom code \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\nUpdate Inserted Code    = !==[INSERTED>$$$$]==>      !==[\/INSERTED>$$$$]==>\r\nUpdate Replaced Code    = !==[REPLACED>$$$$]==>      !==[\/REPLACED>$$$$]==>\r\n\r\n\/\/\/\/\/\/\/\/23 is the ID of the code in the system don't change it!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n\r\nMore info read: https:\/\/git.vdm.dev\/joomla\/Component-Builder\/wiki\/TIPS:-Custom-Code\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\User\\User;\r\nuse Joomla\\CMS\\Filesystem\\Folder;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Version;",
diff --git a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/README.md b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/README.md
index 86cab65..df5fa6d 100644
--- a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/README.md
+++ b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/README.md
@@ -8,6 +8,7 @@
 ```
 # class Power (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Service**
+> extends: ****
 ```uml
 @startuml
 class Power  #Gold {
diff --git a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.php b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.php
index 038a5b5..f965400 100644
--- a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.php
+++ b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Power\Service;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use VDM\Joomla\Componentbuilder\Power\Config;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Table;
+use VDM\Joomla\Componentbuilder\Table;
 use VDM\Joomla\Componentbuilder\Power\Grep;
 use VDM\Joomla\Componentbuilder\Power\Super as Superpower;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Parser;
@@ -91,9 +91,9 @@ class Power implements ServiceProviderInterface
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_powers_repository_path,
+			$container->get('Gitea.Repository.Contents'),
 			$container->get('Config')->approved_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Config')->local_powers_repository_path
 		);
 	}
 
@@ -109,8 +109,7 @@ class Power implements ServiceProviderInterface
 	{
 		return new Superpower(
 			$container->get('Power.Grep'),
-			$container->get('Power.Database.Insert'),
-			$container->get('Power.Database.Update')
+			$container->get('Data.Item')
 		);
 	}
 
diff --git a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.power b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.power
index b05bc5b..10f11dd 100644
--- a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.power
+++ b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/code.power
@@ -61,9 +61,9 @@
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_powers_repository_path,
+			$container->get('Gitea.Repository.Contents'),
 			$container->get('Config')->approved_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Config')->local_powers_repository_path
 		);
 	}
 
@@ -79,8 +79,7 @@
 	{
 		return new Superpower(
 			$container->get('Power.Grep'),
-			$container->get('Power.Database.Insert'),
-			$container->get('Power.Database.Update')
+			$container->get('Data.Item')
 		);
 	}
 
diff --git a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/settings.json b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/settings.json
index b04e526..1f5a909 100644
--- a/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/settings.json
+++ b/src/02bc072b-1e89-46c1-9732-4da77b1a9ac9/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "02bc072b-1e89-46c1-9732-4da77b1a9ac9",
     "implements": [
         "-1"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Service.Power",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Service.Power",
     "description": "Power Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/037c7274-fb16-455d-989a-bf1da022620b/README.md b/src/037c7274-fb16-455d-989a-bf1da022620b/README.md
index e50e0f9..8df761f 100644
--- a/src/037c7274-fb16-455d-989a-bf1da022620b/README.md
+++ b/src/037c7274-fb16-455d-989a-bf1da022620b/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customimportscripts (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Customimportscripts  #Gold {
diff --git a/src/037c7274-fb16-455d-989a-bf1da022620b/code.php b/src/037c7274-fb16-455d-989a-bf1da022620b/code.php
index d2d898e..baa5ca3 100644
--- a/src/037c7274-fb16-455d-989a-bf1da022620b/code.php
+++ b/src/037c7274-fb16-455d-989a-bf1da022620b/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\Component\Helper;
 
 
 /**
diff --git a/src/037c7274-fb16-455d-989a-bf1da022620b/settings.json b/src/037c7274-fb16-455d-989a-bf1da022620b/settings.json
index ee2185a..c302f65 100644
--- a/src/037c7274-fb16-455d-989a-bf1da022620b/settings.json
+++ b/src/037c7274-fb16-455d-989a-bf1da022620b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "037c7274-fb16-455d-989a-bf1da022620b",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Customimportscripts",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Customimportscripts",
     "description": "Model Custom Import Scripts Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/README.md b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/README.md
index efb433e..f3efd98 100644
--- a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/README.md
+++ b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/README.md
@@ -8,6 +8,7 @@
 ```
 # class Infusion (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Infusion  #Gold {
diff --git a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.php b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.php
index 8a08685..7e0402a 100644
--- a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.php
+++ b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.php
@@ -21,9 +21,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Power\Repo\Readme as RepoReadme;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Repos\Readme as ReposReadme;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface as Event;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
@@ -115,6 +115,8 @@ class Infusion
 		'unchanged_description' => 'description',
 		'extends' => 'extends',
 		'unchanged_extends_custom' => 'extends_custom',
+		'extendsinterfaces' => 'extendsinterfaces',
+		'unchanged_extendsinterfaces_custom' => 'extendsinterfaces_custom',
 		'guid' => 'guid',
 		'unchanged_head' => 'head',
 		'use_selection' => 'use_selection',
diff --git a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.power b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.power
index 7d23bec..5a85b77 100644
--- a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.power
+++ b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/code.power
@@ -81,6 +81,8 @@
 		'unchanged_description' => 'description',
 		'extends' => 'extends',
 		'unchanged_extends_custom' => 'extends_custom',
+		'extendsinterfaces' => 'extendsinterfaces',
+		'unchanged_extendsinterfaces_custom' => 'extendsinterfaces_custom',
 		'guid' => 'guid',
 		'unchanged_head' => 'head',
 		'use_selection' => 'use_selection',
diff --git a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/settings.json b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/settings.json
index ab93906..f0a4e44 100644
--- a/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/settings.json
+++ b/src/0419081e-4cb3-4c65-8c6a-ffe941fb0f1c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0419081e-4cb3-4c65-8c6a-ffe941fb0f1c",
     "implements": null,
     "load_selection": null,
@@ -59,6 +59,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Infusion",
     "description": "Compiler Power Infusion\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/053803e6-1251-4aed-aefe-46a8e84198d2/README.md b/src/053803e6-1251-4aed-aefe-46a8e84198d2/README.md
index f9dfbc1..f14c47a 100644
--- a/src/053803e6-1251-4aed-aefe-46a8e84198d2/README.md
+++ b/src/053803e6-1251-4aed-aefe-46a8e84198d2/README.md
@@ -8,6 +8,7 @@
 ```
 # class Paths (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode\Extractor**
+> extends: ****
 ```uml
 @startuml
 class Paths  #Gold {
diff --git a/src/053803e6-1251-4aed-aefe-46a8e84198d2/code.php b/src/053803e6-1251-4aed-aefe-46a8e84198d2/code.php
index 9dd8f63..ed873b0 100644
--- a/src/053803e6-1251-4aed-aefe-46a8e84198d2/code.php
+++ b/src/053803e6-1251-4aed-aefe-46a8e84198d2/code.php
@@ -14,10 +14,10 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Customcode\Extractor;
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
diff --git a/src/053803e6-1251-4aed-aefe-46a8e84198d2/settings.json b/src/053803e6-1251-4aed-aefe-46a8e84198d2/settings.json
index bb4d17a..3b14435 100644
--- a/src/053803e6-1251-4aed-aefe-46a8e84198d2/settings.json
+++ b/src/053803e6-1251-4aed-aefe-46a8e84198d2/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "053803e6-1251-4aed-aefe-46a8e84198d2",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.Extractor.Paths",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.Extractor.Paths",
     "description": "Compiler Custom Code Paths\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/05448890-e324-41a0-b6db-d804bfc241cc/README.md b/src/05448890-e324-41a0-b6db-d804bfc241cc/README.md
index 7dd13c3..83adaef 100644
--- a/src/05448890-e324-41a0-b6db-d804bfc241cc/README.md
+++ b/src/05448890-e324-41a0-b6db-d804bfc241cc/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldsetString (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldsetString << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/05448890-e324-41a0-b6db-d804bfc241cc/code.php b/src/05448890-e324-41a0-b6db-d804bfc241cc/code.php
index 789ac30..3076bac 100644
--- a/src/05448890-e324-41a0-b6db-d804bfc241cc/code.php
+++ b/src/05448890-e324-41a0-b6db-d804bfc241cc/code.php
@@ -25,8 +25,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Creator\Layout;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldsetinterface;
 
 
diff --git a/src/05448890-e324-41a0-b6db-d804bfc241cc/settings.json b/src/05448890-e324-41a0-b6db-d804bfc241cc/settings.json
index 8c5a9ef..5182acf 100644
--- a/src/05448890-e324-41a0-b6db-d804bfc241cc/settings.json
+++ b/src/05448890-e324-41a0-b6db-d804bfc241cc/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "05448890-e324-41a0-b6db-d804bfc241cc",
     "implements": [
         "d44f3294-6b68-4d85-a617-15fb772b7d14"
@@ -73,7 +73,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetString",
     "description": "Fieldset String Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/05744dd3-4030-4cf8-8dda-a93ab809b473/code.php b/src/05744dd3-4030-4cf8-8dda-a93ab809b473/code.php
index 779e1cf..345418d 100644
--- a/src/05744dd3-4030-4cf8-8dda-a93ab809b473/code.php
+++ b/src/05744dd3-4030-4cf8-8dda-a93ab809b473/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\JoomlaPower\Model;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface;
+use VDM\Joomla\Interfaces\ModelInterface;
 use VDM\Joomla\Componentbuilder\Power\Model\Load as ExtendingLoad;
 
 
diff --git a/src/05744dd3-4030-4cf8-8dda-a93ab809b473/settings.json b/src/05744dd3-4030-4cf8-8dda-a93ab809b473/settings.json
index afef44e..66f2a0a 100644
--- a/src/05744dd3-4030-4cf8-8dda-a93ab809b473/settings.json
+++ b/src/05744dd3-4030-4cf8-8dda-a93ab809b473/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.JoomlaPower.Model.Load",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Model.Load",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Model.Load",
     "description": "Joomla Power Model Load\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/README.md b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/README.md
index 8e146f3..b529d11 100644
--- a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/README.md
+++ b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Dynamicget**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/code.php b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/code.php
index 5d3aaec..25d55ac 100644
--- a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/code.php
+++ b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/code.php
@@ -21,8 +21,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Dynamicget;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/settings.json b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/settings.json
index c673e54..765d6ec 100644
--- a/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/settings.json
+++ b/src/05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Dynamicget.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Dynamicget.Data",
     "description": "Dynamic Get Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/README.md b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/README.md
index b46945a..1207275 100644
--- a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/README.md
+++ b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/README.md
@@ -8,6 +8,7 @@
 ```
 # class Model (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Model  #Gold {
diff --git a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/code.php b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/code.php
index a7bbb46..8333982 100644
--- a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/code.php
+++ b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Server\Model\Load as ServerLoad;
+use VDM\Joomla\Componentbuilder\Server\Model\Load as ServerLoad;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Joomlaplugins;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Joomlamodules;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Historycomponent;
diff --git a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/settings.json b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/settings.json
index 1766fda..ca83d86 100644
--- a/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/settings.json
+++ b/src/0601fee8-d51e-4af0-9ad3-b5f8700c4a45/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0601fee8-d51e-4af0-9ad3-b5f8700c4a45",
     "implements": [
         "-1"
@@ -185,6 +185,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Model",
     "description": "Model Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/README.md b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/README.md
index ca6d5e2..23c80f5 100644
--- a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/README.md
+++ b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/README.md
@@ -8,6 +8,7 @@
 ```
 # class Placeholder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class Placeholder  #Gold {
diff --git a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/code.php b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/code.php
index 00e4627..cb10955 100644
--- a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/code.php
+++ b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
diff --git a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/settings.json b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/settings.json
index 0c7ad74..4e1d46d 100644
--- a/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/settings.json
+++ b/src/06453ada-e370-49f0-b262-e3f5a8ed0c2c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "06453ada-e370-49f0-b262-e3f5a8ed0c2c",
     "implements": [
         "a6cdd935-c038-4a54-8446-54bed87f003c"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Placeholder",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Placeholder",
     "description": "Compiler Placeholder\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/README.md b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/README.md
index 5b921b6..857f10d 100644
--- a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/README.md
+++ b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/README.md
@@ -8,6 +8,7 @@
 ```
 # class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Joomlamodule**
+> extends: ****
 ```uml
 @startuml
 class Structure  #Gold {
diff --git a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/code.php b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/code.php
index 6332979..7ccbfb9 100644
--- a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/code.php
+++ b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/code.php
@@ -26,10 +26,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\TemplateData;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
 
 
 /**
diff --git a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/settings.json b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/settings.json
index b9b0bb7..02b9bdd 100644
--- a/src/071c7cff-4c88-4b80-bd99-066c572dcb71/settings.json
+++ b/src/071c7cff-4c88-4b80-bd99-066c572dcb71/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "071c7cff-4c88-4b80-bd99-066c572dcb71",
     "implements": null,
     "load_selection": null,
@@ -83,7 +83,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Joomlamodule.Structure",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Joomlamodule.Structure",
     "description": "Joomla Module Structure Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0a524af3-f647-4f62-a422-d7d36ebe749b/code.php b/src/0a524af3-f647-4f62-a422-d7d36ebe749b/code.php
index 73a0218..26a0c64 100644
--- a/src/0a524af3-f647-4f62-a422-d7d36ebe749b/code.php
+++ b/src/0a524af3-f647-4f62-a422-d7d36ebe749b/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/0a524af3-f647-4f62-a422-d7d36ebe749b/settings.json b/src/0a524af3-f647-4f62-a422-d7d36ebe749b/settings.json
index 024a828..f4e838d 100644
--- a/src/0a524af3-f647-4f62-a422-d7d36ebe749b/settings.json
+++ b/src/0a524af3-f647-4f62-a422-d7d36ebe749b/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ConfigFieldsets",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ConfigFieldsets",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ConfigFieldsets",
     "description": "Config Field Sets Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0b45357f-b077-4337-92f3-65c1e19d36cd/code.php b/src/0b45357f-b077-4337-92f3-65c1e19d36cd/code.php
index db08890..bfef415 100644
--- a/src/0b45357f-b077-4337-92f3-65c1e19d36cd/code.php
+++ b/src/0b45357f-b077-4337-92f3-65c1e19d36cd/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\ToString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\ToString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/0b45357f-b077-4337-92f3-65c1e19d36cd/settings.json b/src/0b45357f-b077-4337-92f3-65c1e19d36cd/settings.json
index 7190bdd..168e564 100644
--- a/src/0b45357f-b077-4337-92f3-65c1e19d36cd/settings.json
+++ b/src/0b45357f-b077-4337-92f3-65c1e19d36cd/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.HiddenFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.HiddenFields",
     "description": "Hidden Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/README.md b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/README.md
index c2122ef..e29bbee 100644
--- a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/README.md
+++ b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/README.md
@@ -14,14 +14,10 @@
 class Config  #Gold {
   # JoomlaRegistry $config
   + __construct(?Input $input = null, ?JoomlaRegistry $params = null, ...)
+  # getGiteausername() : ?string
   # getGiteatoken() : ?string
-  # getAddcustomgiteaurl() : int
-  # getCustomgiteaurl() : ?string
-  # getCustomgiteatoken() : ?string
   # getJoomlapowerscoreorganisation() : string
   # getJoomlapowersinitrepos() : array
-  # getTmppath() : string
-  # getLocaljoomlapowersrepositorypath() : string
   # getApprovedjoomlapaths() : array
 }
 
@@ -36,35 +32,21 @@ note right of Config::__construct
     ?JoomlaRegistry $config = null
 end note
 
-note left of Config::getGiteatoken
+note right of Config::getGiteausername
+  get Gitea Username
+
+  since: 3.2.0
+  return: ?string
+end note
+
+note right of Config::getGiteatoken
   get Gitea Access Token
 
   since: 3.2.0
   return: ?string
 end note
 
-note right of Config::getAddcustomgiteaurl
-  get Add Custom Gitea URL
-
-  since: 3.2.0
-  return: int
-end note
-
-note left of Config::getCustomgiteaurl
-  get Custom Gitea URL
-
-  since: 3.2.0
-  return: ?string
-end note
-
-note right of Config::getCustomgiteatoken
-  get Custom Gitea Access Token
-
-  since: 3.2.0
-  return: ?string
-end note
-
-note left of Config::getJoomlapowerscoreorganisation
+note right of Config::getJoomlapowerscoreorganisation
   Get super power core organisation
 
   since: 3.2.0
@@ -78,21 +60,7 @@ note right of Config::getJoomlapowersinitrepos
   return: array
 end note
 
-note left of Config::getTmppath
-  get temporary path
-
-  since: 3.2.0
-  return: string
-end note
-
-note right of Config::getLocaljoomlapowersrepositorypath
-  Get local joomla super powers repository path
-
-  since: 3.2.0
-  return: string
-end note
-
-note left of Config::getApprovedjoomlapaths
+note right of Config::getApprovedjoomlapaths
   Get joomla power approved paths
 
   since: 3.2.0
diff --git a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.php b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.php
index aa5ae56..a1d52bc 100644
--- a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.php
+++ b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.php
@@ -14,8 +14,9 @@ namespace VDM\Joomla\Componentbuilder\JoomlaPower;
 
 use Joomla\Registry\Registry as JoomlaRegistry;
 use Joomla\CMS\Factory as JoomlaFactory;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Componentbuilder\Utilities\RepoHelper;
 use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
 
 
@@ -57,6 +58,17 @@ class Config extends BaseConfig
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -65,50 +77,7 @@ class Config extends BaseConfig
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -135,40 +104,20 @@ class Config extends BaseConfig
 	{
 		// some defaults repos we need by JCB
 		$repos = [];
-		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['owner' => $this->joomla_powers_core_organisation, 'repo' => 'joomla-powers', 'branch' => 'master'];
+		// get the users own power repo (can overwrite all)
+		if (!empty($this->gitea_username))
+		{
+			$repos[$this->gitea_username . '.joomla-powers'] = (object) ['organisation' => $this->gitea_username, 'repository' => 'joomla-powers', 'read_branch' => 'master'];
+		}
+		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['organisation' => $this->joomla_powers_core_organisation, 'repository' => 'joomla-powers', 'read_branch' => 'master'];
 
 		return $repos;
 	}
 
-	/**
-	 * get temporary path
-	 *
-	 * @return  string  The temporary path
-	 * @since 3.2.0
-	 */
-	protected function getTmppath(): string
-	{
-		// get the temporary path
-		return $this->config->get('tmp_path');
-	}
-
-	/**
-	 * Get local joomla super powers repository path
-	 *
-	 * @return  string The path to the local repository
-	 * @since 3.2.0
-	 */
-	protected function getLocaljoomlapowersrepositorypath(): string
-	{
-		$default = $this->tmp_path . '/joomla_powers';
-
-		return $this->params->get('local_joomla_powers_repository_path', $default);
-	}
-
 	/**
 	 * Get joomla power approved paths
 	 *
-	 * @return  array The paths to the repositories on Gitea
+	 * @return  array The approved paths to the repositories on Gitea
 	 * @since 3.2.0
 	 */
 	protected function getApprovedjoomlapaths(): array
@@ -176,6 +125,22 @@ class Config extends BaseConfig
 		// some defaults repos we need by JCB
 		$approved = $this->joomla_powers_init_repos;
 
+		$paths = RepoHelper::get(2); // Joomla Power = 2
+
+		if ($paths !== null)
+		{
+			foreach ($paths as $path)
+			{
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
+				if ($owner !== null && $repo !== null)
+				{
+					// we make sure to get only the objects
+					$approved = ["{$owner}.{$repo}" => $path] + $approved;
+				}
+			}
+		}
+
 		return array_values($approved);
 	}
 }
diff --git a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.power b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.power
index 4217cb0..ad9cbb1 100644
--- a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.power
+++ b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/code.power
@@ -23,6 +23,17 @@
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -31,50 +42,7 @@
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -101,40 +69,20 @@
 	{
 		// some defaults repos we need by JCB
 		$repos = [];
-		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['owner' => $this->joomla_powers_core_organisation, 'repo' => 'joomla-powers', 'branch' => 'master'];
+		// get the users own power repo (can overwrite all)
+		if (!empty($this->gitea_username))
+		{
+			$repos[$this->gitea_username . '.joomla-powers'] = (object) ['organisation' => $this->gitea_username, 'repository' => 'joomla-powers', 'read_branch' => 'master'];
+		}
+		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['organisation' => $this->joomla_powers_core_organisation, 'repository' => 'joomla-powers', 'read_branch' => 'master'];
 
 		return $repos;
 	}
 
-	/**
-	 * get temporary path
-	 *
-	 * @return  string  The temporary path
-	 * @since 3.2.0
-	 */
-	protected function getTmppath(): string
-	{
-		// get the temporary path
-		return $this->config->get('tmp_path');
-	}
-
-	/**
-	 * Get local joomla super powers repository path
-	 *
-	 * @return  string The path to the local repository
-	 * @since 3.2.0
-	 */
-	protected function getLocaljoomlapowersrepositorypath(): string
-	{
-		$default = $this->tmp_path . '/joomla_powers';
-
-		return $this->params->get('local_joomla_powers_repository_path', $default);
-	}
-
 	/**
 	 * Get joomla power approved paths
 	 *
-	 * @return  array The paths to the repositories on Gitea
+	 * @return  array The approved paths to the repositories on Gitea
 	 * @since 3.2.0
 	 */
 	protected function getApprovedjoomlapaths(): array
@@ -142,5 +90,21 @@
 		// some defaults repos we need by JCB
 		$approved = $this->joomla_powers_init_repos;
 
+		$paths = RepoHelper::get(2); // Joomla Power = 2
+
+		if ($paths !== null)
+		{
+			foreach ($paths as $path)
+			{
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
+				if ($owner !== null && $repo !== null)
+				{
+					// we make sure to get only the objects
+					$approved = ["{$owner}.{$repo}" => $path] + $approved;
+				}
+			}
+		}
+
 		return array_values($approved);
 	}
\ No newline at end of file
diff --git a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/settings.json b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/settings.json
index bdaa659..f1448d2 100644
--- a/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/settings.json
+++ b/src/0b821bba-7503-4448-90e7-f3c1bd51dfd6/settings.json
@@ -17,9 +17,14 @@
         "use_selection1": {
             "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
             "as": "default"
+        },
+        "use_selection2": {
+            "use": "c6619b00-261c-473b-8094-d4fe9e6bab39",
+            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Config",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Config",
     "description": "Compiler Configurations\r\n\r\n\tAll these functions are accessed via the direct name without the get:\r\n\texample: $this->component_code_name calls: $this->getComponentcodename()\r\n\r\n\tAll values once called are cached, yet can be updated directly:\r\n\texample: $this->component_code_name = 'new_code_name'; \/\/ be warned!\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory as JoomlaFactory;",
diff --git a/src/0d08c583-04d5-454e-b756-48ca05e1651a/README.md b/src/0d08c583-04d5-454e-b756-48ca05e1651a/README.md
index 0070fc3..bcc48c6 100644
--- a/src/0d08c583-04d5-454e-b756-48ca05e1651a/README.md
+++ b/src/0d08c583-04d5-454e-b756-48ca05e1651a/README.md
@@ -8,6 +8,7 @@
 ```
 # class Readme (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power\Repos**
+> extends: ****
 ```uml
 @startuml
 class Readme  #Gold {
diff --git a/src/0d08c583-04d5-454e-b756-48ca05e1651a/settings.json b/src/0d08c583-04d5-454e-b756-48ca05e1651a/settings.json
index 729e6f2..6798833 100644
--- a/src/0d08c583-04d5-454e-b756-48ca05e1651a/settings.json
+++ b/src/0d08c583-04d5-454e-b756-48ca05e1651a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0d08c583-04d5-454e-b756-48ca05e1651a",
     "implements": null,
     "load_selection": null,
@@ -23,6 +23,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Repos.Readme",
     "description": "Compiler Power Repos Readme\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/README.md b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/README.md
index 0fb2e63..d63542c 100644
--- a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/README.md
+++ b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/README.md
@@ -8,6 +8,7 @@
 ```
 # class Loader (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Loader  #Gold {
diff --git a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/code.php b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/code.php
index 1205969..99e6bed 100644
--- a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/code.php
+++ b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/code.php
@@ -17,7 +17,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\FootableScripts;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\GoogleChart;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\GetModule;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\UikitComp;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 
 
 /**
diff --git a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/settings.json b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/settings.json
index e373366..dd73c6f 100644
--- a/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/settings.json
+++ b/src/0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0d71c2d9-2fc0-4c20-82c5-43c46b0fc6f7",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Loader",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Loader",
     "description": "Model Auto Loader Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0d8db719-39a6-48b4-85a6-2f97e784e588/code.php b/src/0d8db719-39a6-48b4-85a6-2f97e784e588/code.php
index ba57c2b..3c3cce1 100644
--- a/src/0d8db719-39a6-48b4-85a6-2f97e784e588/code.php
+++ b/src/0d8db719-39a6-48b4-85a6-2f97e784e588/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/0d8db719-39a6-48b4-85a6-2f97e784e588/settings.json b/src/0d8db719-39a6-48b4-85a6-2f97e784e588/settings.json
index c934560..604eea3 100644
--- a/src/0d8db719-39a6-48b4-85a6-2f97e784e588/settings.json
+++ b/src/0d8db719-39a6-48b4-85a6-2f97e784e588/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.DatabaseKeys",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseKeys",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseKeys",
     "description": "Database Keys Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/code.php b/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/code.php
index 355c98d..020475d 100644
--- a/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/code.php
+++ b/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/settings.json b/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/settings.json
index 338dfd1..74c94ac 100644
--- a/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/settings.json
+++ b/src/0d9d3294-0bed-4c44-b1a1-e172f62cafb2/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.DoNotEscape",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DoNotEscape",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DoNotEscape",
     "description": "Do Not Escape Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/README.md b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/README.md
index c69a501..758fc40 100644
--- a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/README.md
+++ b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/README.md
@@ -8,6 +8,7 @@
 ```
 # class Permissions (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Permissions  #Gold {
diff --git a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/code.php b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/code.php
index ff8fc2d..45957f9 100644
--- a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/code.php
+++ b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/settings.json b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/settings.json
index f759553..23ac6b4 100644
--- a/src/0dabc67c-abec-4541-82bf-279abd3c9be1/settings.json
+++ b/src/0dabc67c-abec-4541-82bf-279abd3c9be1/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0dabc67c-abec-4541-82bf-279abd3c9be1",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Permissions",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Permissions",
     "description": "Model Permissions Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/code.php b/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/code.php
index 07e3ed4..c32d4db 100644
--- a/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/code.php
+++ b/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\Count;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\Count;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/settings.json b/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/settings.json
index 7c380c0..6d18319 100644
--- a/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/settings.json
+++ b/src/0f141480-afe6-41fb-996c-2a4e566a2f0d/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.NewPublishingFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.NewPublishingFields",
     "description": "New Publishing Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/README.md b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/README.md
index 2737b93..9cee164 100644
--- a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/README.md
+++ b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsGlobal (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsGlobal << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/code.php b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/code.php
index 74c0723..343fdb0 100644
--- a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/code.php
+++ b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/code.php
@@ -19,7 +19,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\Contributors;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ConfigFieldsets;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ExtensionsParams;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ConfigFieldsetsCustomfield as Customfield;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 
 
diff --git a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/settings.json b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/settings.json
index a71f71e..70bd265 100644
--- a/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/settings.json
+++ b/src/0fe3133d-1ff3-4444-9229-4218d8fb338e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "0fe3133d-1ff3-4444-9229-4218d8fb338e",
     "implements": null,
     "load_selection": null,
@@ -47,7 +47,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGlobal",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGlobal",
     "description": "Config Fieldsets Global Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/README.md b/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/README.md
index 81e7550..5b2c649 100644
--- a/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/README.md
+++ b/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/README.md
@@ -8,6 +8,7 @@
 ```
 # interface PowerInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface PowerInterface  #Lavender {
diff --git a/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/settings.json b/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/settings.json
index 0c24654..b52d007 100644
--- a/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/settings.json
+++ b/src/1133c2d7-ba7e-4c95-8cde-01f084d04682/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1133c2d7-ba7e-4c95-8cde-01f084d04682",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.PowerInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.PowerInterface",
     "description": "Compiler Power Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/README.md b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/README.md
index a3b6018..385d97a 100644
--- a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/README.md
+++ b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Router (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class Router << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/code.php b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/code.php
index 4f7ba55..eeddd63 100644
--- a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/code.php
+++ b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/code.php
@@ -19,8 +19,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Creator\RouterConstructorDefault as Def
 use VDM\Joomla\Componentbuilder\Compiler\Creator\RouterConstructorManual as ManualConstructor;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\RouterMethodsDefault as DefaultMethods;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\RouterMethodsManual as ManualMethods;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/settings.json b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/settings.json
index f0c2f21..332f6df 100644
--- a/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/settings.json
+++ b/src/1294a7c7-46fb-4527-a69d-f8db830fd39a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1294a7c7-46fb-4527-a69d-f8db830fd39a",
     "implements": null,
     "load_selection": null,
@@ -47,7 +47,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.Router",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.Router",
     "description": "Router Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/README.md b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/README.md
index de2f2ce..ac15c24 100644
--- a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/README.md
+++ b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Groups (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Groups << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/code.php b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/code.php
index 8c807da..ddf57c2 100644
--- a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/code.php
+++ b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 
 use Joomla\CMS\Factory;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/settings.json b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/settings.json
index 8b4f26e..aab9e1b 100644
--- a/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/settings.json
+++ b/src/12df35ad-2d44-4c4c-a7d5-a3350932a520/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "12df35ad-2d44-4c4c-a7d5-a3350932a520",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Groups",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Groups",
     "description": "Compiler Field Groups\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/README.md b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/README.md
index 9e7109c..a18b3c0 100644
--- a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/README.md
+++ b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/README.md
@@ -8,6 +8,7 @@
 ```
 # class Tabs (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Tabs  #Gold {
diff --git a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/code.php b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/code.php
index 8e0030a..f882ffc 100644
--- a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/code.php
+++ b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/settings.json b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/settings.json
index 26d741c..fe4b132 100644
--- a/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/settings.json
+++ b/src/143ac6ea-b64f-4331-9a97-31e3fce2bb69/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "143ac6ea-b64f-4331-9a97-31e3fce2bb69",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Tabs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Tabs",
     "description": "Model Tabs Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/README.md b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/README.md
index 2cffd79..90c0d90 100644
--- a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/README.md
+++ b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AccessSections (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class AccessSections << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/code.php b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/code.php
index ffcb450..d59a3ce 100644
--- a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/code.php
+++ b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/code.php
@@ -26,9 +26,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionViews;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionFields;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionComponent;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\CustomButtonPermissions;
-use VastDevelopmentMethod\Joomla\Utilities\MathHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\MathHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/settings.json b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/settings.json
index 4911c26..263e6f6 100644
--- a/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/settings.json
+++ b/src/15615db0-02b9-454f-a82e-1ab39ae5e6a9/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "15615db0-02b9-454f-a82e-1ab39ae5e6a9",
     "implements": null,
     "load_selection": null,
@@ -79,7 +79,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.AccessSections",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.AccessSections",
     "description": "Access Sections Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/README.md b/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/README.md
index 236ce8b..3544411 100644
--- a/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/README.md
+++ b/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/README.md
@@ -8,6 +8,7 @@
 ```
 # final class SiteFieldData (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class SiteFieldData << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/settings.json b/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/settings.json
index 7570e41..a409fcf 100644
--- a/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/settings.json
+++ b/src/15b4addf-bf6b-4691-9c92-858c7de9c2c1/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "15b4addf-bf6b-4691-9c92-858c7de9c2c1",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "SiteField"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.SiteFieldData",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.SiteFieldData",
     "description": "Site Field Data Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/README.md b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/README.md
index 8334f62..3a6d464 100644
--- a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/README.md
+++ b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InputButton (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class InputButton << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/code.php b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/code.php
index ca32dca..be0f88f 100644
--- a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/code.php
+++ b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Permission;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
diff --git a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/settings.json b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/settings.json
index c08b47b..c888ed9 100644
--- a/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/settings.json
+++ b/src/163fa7ca-21bd-4e7f-a618-26fe10b870fe/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "163fa7ca-21bd-4e7f-a618-26fe10b870fe",
     "implements": [
         "c600f58c-3fe2-4d2d-b711-2660eab6effe"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.InputButton",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.InputButton",
     "description": "Compiler Field Input Button\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/README.md b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/README.md
index 2a574fe..9e7ccf7 100644
--- a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/README.md
+++ b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/README.md
@@ -8,6 +8,7 @@
 ```
 # class Historycomponent (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Historycomponent  #Gold {
diff --git a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/code.php b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/code.php
index 195128d..37bdb9a 100644
--- a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/code.php
+++ b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/code.php
@@ -16,9 +16,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HistoryInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Updatesql;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 
 /**
diff --git a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/settings.json b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/settings.json
index 1429006..e25d74f 100644
--- a/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/settings.json
+++ b/src/17a728e9-d6cf-4060-9efb-241b0ff2f981/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "17a728e9-d6cf-4060-9efb-241b0ff2f981",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Historycomponent",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Historycomponent",
     "description": "Model Component History Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/17bf80af-3609-4f36-a520-be1a339c278b/code.php b/src/17bf80af-3609-4f36-a520-be1a339c278b/code.php
index 8d52722..338aa80 100644
--- a/src/17bf80af-3609-4f36-a520-be1a339c278b/code.php
+++ b/src/17bf80af-3609-4f36-a520-be1a339c278b/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\InArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\InArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/17bf80af-3609-4f36-a520-be1a339c278b/settings.json b/src/17bf80af-3609-4f36-a520-be1a339c278b/settings.json
index da33970..221c7e0 100644
--- a/src/17bf80af-3609-4f36-a520-be1a339c278b/settings.json
+++ b/src/17bf80af-3609-4f36-a520-be1a339c278b/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ScriptMediaSwitch",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ScriptMediaSwitch",
     "description": "Script Media Switch Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/17c590ed-8a44-485c-9be8-9a144a6b7429/README.md b/src/17c590ed-8a44-485c-9be8-9a144a6b7429/README.md
index c50e7fc..03a30e4 100644
--- a/src/17c590ed-8a44-485c-9be8-9a144a6b7429/README.md
+++ b/src/17c590ed-8a44-485c-9be8-9a144a6b7429/README.md
@@ -8,6 +8,7 @@
 ```
 # final class RouterMethodsDefault (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class RouterMethodsDefault << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/17c590ed-8a44-485c-9be8-9a144a6b7429/settings.json b/src/17c590ed-8a44-485c-9be8-9a144a6b7429/settings.json
index 4c7c934..296ed79 100644
--- a/src/17c590ed-8a44-485c-9be8-9a144a6b7429/settings.json
+++ b/src/17c590ed-8a44-485c-9be8-9a144a6b7429/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "17c590ed-8a44-485c-9be8-9a144a6b7429",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.RouterMethodsDefault",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.RouterMethodsDefault",
     "description": "Router Methods Default Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/code.php b/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/code.php
index 5419927..0f5329d 100644
--- a/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/code.php
+++ b/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/settings.json b/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/settings.json
index e79a91e..6382f0b 100644
--- a/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/settings.json
+++ b/src/17fa7789-a7d1-465e-b733-8c8d53f5ca1b/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteMainGet",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteMainGet",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteMainGet",
     "description": "Site Main Get Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/code.php b/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/code.php
index 6cc0e01..df3982e 100644
--- a/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/code.php
+++ b/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\ToString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\ToString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/settings.json b/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/settings.json
index afdcfd8..0422125 100644
--- a/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/settings.json
+++ b/src/1ae9a8e8-59f7-4844-a08d-9a4dce4be076/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DynamicFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DynamicFields",
     "description": "Dynamic Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1aefb8f5-486f-4f00-adf9-696340b3254e/README.md b/src/1aefb8f5-486f-4f00-adf9-696340b3254e/README.md
index 46d50d1..88136d3 100644
--- a/src/1aefb8f5-486f-4f00-adf9-696340b3254e/README.md
+++ b/src/1aefb8f5-486f-4f00-adf9-696340b3254e/README.md
@@ -8,6 +8,7 @@
 ```
 # interface InstallInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Extension**
+> extends: ****
 ```uml
 @startuml
 interface InstallInterface  #Lavender {
diff --git a/src/1aefb8f5-486f-4f00-adf9-696340b3254e/settings.json b/src/1aefb8f5-486f-4f00-adf9-696340b3254e/settings.json
index 651b434..8849fcf 100644
--- a/src/1aefb8f5-486f-4f00-adf9-696340b3254e/settings.json
+++ b/src/1aefb8f5-486f-4f00-adf9-696340b3254e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1aefb8f5-486f-4f00-adf9-696340b3254e",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Extension.InstallInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Extension.InstallInterface",
     "description": "The properties an extension should have to be passed to the InstallScript class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/README.md b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/README.md
index 7f62262..3ed258d 100644
--- a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/README.md
+++ b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InputButton (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class InputButton << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/code.php b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/code.php
index 49ebc7b..22e61bf 100644
--- a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/code.php
+++ b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Permission;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
diff --git a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/settings.json b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/settings.json
index a672ed0..55c964a 100644
--- a/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/settings.json
+++ b/src/1b8a40e9-7847-4341-8a8e-dfdc2d531bbe/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1b8a40e9-7847-4341-8a8e-dfdc2d531bbe",
     "implements": [
         "c600f58c-3fe2-4d2d-b711-2660eab6effe"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.InputButton",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.InputButton",
     "description": "Compiler Field Input Button\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/README.md b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/README.md
index 943ae79..08e3dbc 100644
--- a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/README.md
+++ b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/README.md
@@ -8,6 +8,7 @@
 ```
 # class Gui (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class Gui  #Gold {
diff --git a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/code.php b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/code.php
index 93c6391..9398251 100644
--- a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/code.php
+++ b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/code.php
@@ -15,11 +15,11 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder\Reverse;
diff --git a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/settings.json b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/settings.json
index 533d86b..2c2f6a6 100644
--- a/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/settings.json
+++ b/src/1bd48df2-4f7e-4581-9fe9-4b54e59105e3/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1bd48df2-4f7e-4581-9fe9-4b54e59105e3",
     "implements": [
         "2cc8517d-1105-4697-9743-048b4b7c089c"
@@ -49,7 +49,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.Gui",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.Gui",
     "description": "Compiler Gui Custom Code\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;",
diff --git a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/README.md b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/README.md
index 4bed7ec..512cc8b 100644
--- a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/README.md
+++ b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/README.md
@@ -8,6 +8,7 @@
 ```
 # class External (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class External  #Gold {
diff --git a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/code.php b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/code.php
index f873a11..c3d6772 100644
--- a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/code.php
+++ b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/code.php
@@ -17,10 +17,10 @@ use Joomla\CMS\User\User;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Filesystem\Path;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\FileHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode\ExternalInterface;
diff --git a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/settings.json b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/settings.json
index 58d7a8b..f782e14 100644
--- a/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/settings.json
+++ b/src/1cef0266-99e2-40d8-919f-c2ce32226b0a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1cef0266-99e2-40d8-919f-c2ce32226b0a",
     "implements": [
         "1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a"
@@ -37,7 +37,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.External",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.External",
     "description": "Compiler External Custom Code\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\User\\User;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Filesystem\\Path;",
diff --git a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/README.md b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/README.md
index a86cd74..f4d3bee 100644
--- a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/README.md
+++ b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/README.md
@@ -8,6 +8,7 @@
 ```
 # class Updateserver (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Updateserver  #Gold {
diff --git a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/code.php b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/code.php
index 2398440..9d994fe 100644
--- a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/code.php
+++ b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/settings.json b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/settings.json
index 7119634..e7d9a64 100644
--- a/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/settings.json
+++ b/src/1d0fd857-12ec-4f47-ab1c-124d85748e24/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1d0fd857-12ec-4f47-ab1c-124d85748e24",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Updateserver",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Updateserver",
     "description": "Model Joomla Update Server Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1d929017-a5de-4e0f-9b5a-838934857e26/README.md b/src/1d929017-a5de-4e0f-9b5a-838934857e26/README.md
index d8e1232..d79dfb1 100644
--- a/src/1d929017-a5de-4e0f-9b5a-838934857e26/README.md
+++ b/src/1d929017-a5de-4e0f-9b5a-838934857e26/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InstallScript (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class InstallScript << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/1d929017-a5de-4e0f-9b5a-838934857e26/code.php b/src/1d929017-a5de-4e0f-9b5a-838934857e26/code.php
index 481c6ed..c36a36b 100644
--- a/src/1d929017-a5de-4e0f-9b5a-838934857e26/code.php
+++ b/src/1d929017-a5de-4e0f-9b5a-838934857e26/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaThree;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Extension\InstallInterface;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\GetScriptInterface;
diff --git a/src/1d929017-a5de-4e0f-9b5a-838934857e26/settings.json b/src/1d929017-a5de-4e0f-9b5a-838934857e26/settings.json
index 44c4e95..5405b6c 100644
--- a/src/1d929017-a5de-4e0f-9b5a-838934857e26/settings.json
+++ b/src/1d929017-a5de-4e0f-9b5a-838934857e26/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1d929017-a5de-4e0f-9b5a-838934857e26",
     "implements": [
         "2e6731ba-3a03-4836-b2c2-4e50e38cb890"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaThree.InstallScript",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaThree.InstallScript",
     "description": "Loading the Extension Installation Script Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1d967151-7c20-4ca7-9400-65233cdcd4db/code.php b/src/1d967151-7c20-4ca7-9400-65233cdcd4db/code.php
index f9d6b42..a9d9809 100644
--- a/src/1d967151-7c20-4ca7-9400-65233cdcd4db/code.php
+++ b/src/1d967151-7c20-4ca7-9400-65233cdcd4db/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 
-use VastDevelopmentMethod\Joomla\Componentbuilder\Abstraction\BaseRegistry;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseRegistry;
 
 
 /**
diff --git a/src/1d967151-7c20-4ca7-9400-65233cdcd4db/settings.json b/src/1d967151-7c20-4ca7-9400-65233cdcd4db/settings.json
index af76757..fc5fe1a 100644
--- a/src/1d967151-7c20-4ca7-9400-65233cdcd4db/settings.json
+++ b/src/1d967151-7c20-4ca7-9400-65233cdcd4db/settings.json
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Utilities.Files",
     "type": "class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Files",
     "description": "Compiler Utilities Files Bucket\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/README.md b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/README.md
index 3abd499..b6c4eb6 100644
--- a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/README.md
+++ b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Header (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class Header << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/code.php b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/code.php
index 9fd1918..712242b 100644
--- a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/code.php
+++ b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/code.php
@@ -22,8 +22,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\Category;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\AccessSwitchList;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Filter;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Tags;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HeaderInterface;
 
 
diff --git a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/settings.json b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/settings.json
index a11c0be..ec3ba6d 100644
--- a/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/settings.json
+++ b/src/1ee227b9-da0f-4e7b-ae66-99a9d53f6f49/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1ee227b9-da0f-4e7b-ae66-99a9d53f6f49",
     "implements": [
         "3a777d70-52ad-49ec-9016-6f7438608613"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFour.Header",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFour.Header",
     "description": "Build headers for all Joomla 4 files\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/README.md b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/README.md
index ad373cd..7e034e8 100644
--- a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/README.md
+++ b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Structure  #Gold {
diff --git a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/code.php b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/code.php
index 83e0b3e..5cddb26 100644
--- a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/code.php
+++ b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/code.php
@@ -23,8 +23,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\File;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Files;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/settings.json b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/settings.json
index 3f7507e..dc27d81 100644
--- a/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/settings.json
+++ b/src/1efdded5-d6c8-452c-8f37-0374483a7b3f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1efdded5-d6c8-452c-8f37-0374483a7b3f",
     "implements": null,
     "load_selection": null,
@@ -43,6 +43,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Structure",
     "description": "Compiler Utilities To Build Structure\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/1f086665-c007-4085-b363-3a118659ff1b/code.php b/src/1f086665-c007-4085-b363-3a118659ff1b/code.php
index 5186716..ac0e171 100644
--- a/src/1f086665-c007-4085-b363-3a118659ff1b/code.php
+++ b/src/1f086665-c007-4085-b363-3a118659ff1b/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/1f086665-c007-4085-b363-3a118659ff1b/settings.json b/src/1f086665-c007-4085-b363-3a118659ff1b/settings.json
index e07050b..14d65eb 100644
--- a/src/1f086665-c007-4085-b363-3a118659ff1b/settings.json
+++ b/src/1f086665-c007-4085-b363-3a118659ff1b/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ItemsMethodEximportString",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ItemsMethodEximportString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ItemsMethodEximportString",
     "description": "Items Method Eximport String Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/1f86db0f-e271-45df-8795-3e503ec76698/README.md b/src/1f86db0f-e271-45df-8795-3e503ec76698/README.md
index 878976a..0944bd8 100644
--- a/src/1f86db0f-e271-45df-8795-3e503ec76698/README.md
+++ b/src/1f86db0f-e271-45df-8795-3e503ec76698/README.md
@@ -6,73 +6,14 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Load (Details)
-> namespace: **VDM\Joomla\Componentbuilder\Power\Database**
+# final class Load (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Power\Data**
+> extends: **ExtendingLoad**
 ```uml
 @startuml
-class Load  #Gold {
-  # Model $model
-  # Database $load
+class Load << (F,LightGreen) >> #RoyalBlue {
   # string $table
-  + __construct(Model $model, Database $load)
-  + value(array $keys, string $field) : mixed
-  + item(array $keys) : ?object
-  + items(array $keys) : ?array
-  - prefix(array $keys) : array
 }
-
-note right of Load::__construct
-  Constructor
-
-  since: 2.0.1
-end note
-
-note right of Load::value
-  Get a value from a given table
-Example: $this->value(
-[
-'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-], 'value_key'
-);
-
-  since: 2.0.1
-  return: mixed
-end note
-
-note right of Load::item
-  Get values from a given table
-Example: $this->item(
-[
-'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-]
-);
-
-  since: 2.0.1
-  return: ?object
-end note
-
-note right of Load::items
-  Get values from a given table
-Example: $this->items(
-[
-'guid' => [
-'operator' => 'IN',
-'value' => [''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'', ''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'']
-]
-]
-);
-Example: $this->items($ids, 'table_name');
-
-  since: 2.0.1
-  return: ?array
-end note
-
-note right of Load::prefix
-  Add prefix to the keys
-
-  since: 2.0.1
-  return: array
-end note
  
 @enduml
 ```
diff --git a/src/1f86db0f-e271-45df-8795-3e503ec76698/code.php b/src/1f86db0f-e271-45df-8795-3e503ec76698/code.php
index dd97e70..c1f10d1 100644
--- a/src/1f86db0f-e271-45df-8795-3e503ec76698/code.php
+++ b/src/1f86db0f-e271-45df-8795-3e503ec76698/code.php
@@ -9,159 +9,26 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\Power\Database;
+namespace VDM\Joomla\Componentbuilder\Power\Data;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface as Model;
-use VastDevelopmentMethod\Joomla\Database\Load as Database;
-use VDM\Joomla\Componentbuilder\Power\Database\LoadInterface;
+use VDM\Joomla\Interfaces\Data\LoadInterface;
+use VDM\Joomla\Abstraction\Data\Load as ExtendingLoad;
 
 
 /**
- * Power Database Load
+ * Power Data Load
  * 
- * @since 2.0.1
+ * @since 3.2.2
  */
-class Load implements LoadInterface
+final class Load extends ExtendingLoad implements LoadInterface
 {
-	/**
-	 * Model Load
-	 *
-	 * @var    Model
-	 * @since 2.0.1
-	 */
-	protected Model $model;
-
-	/**
-	 * Database Load
-	 *
-	 * @var    Database
-	 * @since 2.0.1
-	 */
-	protected Database $load;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Table       $table     The core table object.
-	 * @param Model       $model     The model object.
-	 * @param Database    $load      The database object.
-	 *
-	 * @since 2.0.1
-	 */
-	public function __construct(Model $model, Database $load)
-	{
-		$this->model = $model;
-		$this->load = $load;
-	}
-
-	/**
-	 * Get a value from a given table
-	 *          Example: $this->value(
-	 *                        [
-	 *                           'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-	 *                        ], 'value_key'
-	 *                    );
-	 *
-	 * @param   array      $keys      The item keys
-	 * @param   string     $field     The field key
-	 * @param   string     $table     The table
-	 *
-	 * @return  mixed
-	 * @since 2.0.1
-	 */
-	public function value(array $keys, string $field)
-	{
-		return $this->model->value(
-			$this->load->value(
-				["a.{$field}" => $field],
-				['a' => $this->table],
-				$this->prefix($keys)
-			),
-			$field,
-			$this->table
-		);
-	}
-
-	/**
-	 * Get values from a given table
-	 *          Example: $this->item(
-	 *                        [
-	 *                           'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-	 *                        ]
-	 *                    );
-	 *
-	 * @param   array    $keys      The item keys
-	 * @param   string   $table     The table
-	 *
-	 * @return  object|null
-	 * @since 2.0.1
-	 */
-	public function item(array $keys): ?object
-	{
-		return $this->model->item(
-			$this->load->item(
-				['all' => 'a.*'],
-				['a' => $this->table],
-				$this->prefix($keys)
-			),
-			$this->table
-		);
-	}
- 
-	/**
-	 * Get values from a given table
-	 *          Example: $this->items(
-	 *                        [
-	 *                           'guid' => [
-	 *                              'operator' => 'IN',
-	 *                              'value' => [''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'', ''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'']
-	 *                           ]
-	 *                        ]
-	 *                    );
-	 *          Example: $this->items($ids, 'table_name');
-	 *
-	 * @param   array    $keys    The item keys
-	 * @param   string   $table   The table
-	 *
-	 * @return  array|null
-	 * @since 2.0.1
-	 */
-	public function items(array $keys): ?array
-	{
-		return $this->model->items(
-			$this->load->items(
-				['all' => 'a.*'], ['a' => $this->table], $this->prefix($keys)
-			),
-			$this->table
-		);
-	}
-
-	/**
-	 * Add prefix to the keys
-	 *
-	 * @param   array    $keys The query keys
-	 *
-	 * @return  array
-	 * @since 2.0.1
-	 */
-	private function prefix(array &$keys): array
-	{
-		// update the key values
-		$bucket = [];
-		foreach ($keys as $k => $v)
-		{
-			$bucket['a.' . $k] = $v;
-		}
-		return $bucket;
-	}
+	protected string $table = 'power';
 }
 
diff --git a/src/1f86db0f-e271-45df-8795-3e503ec76698/code.power b/src/1f86db0f-e271-45df-8795-3e503ec76698/code.power
index baac120..e2209eb 100644
--- a/src/1f86db0f-e271-45df-8795-3e503ec76698/code.power
+++ b/src/1f86db0f-e271-45df-8795-3e503ec76698/code.power
@@ -1,139 +1,7 @@
-	/**
-	 * Model Load
-	 *
-	 * @var    Model
-	 * @since 2.0.1
-	 */
-	protected Model $model;
-
-	/**
-	 * Database Load
-	 *
-	 * @var    Database
-	 * @since 2.0.1
-	 */
-	protected Database $load;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Table       $table     The core table object.
-	 * @param Model       $model     The model object.
-	 * @param Database    $load      The database object.
-	 *
-	 * @since 2.0.1
-	 */
-	public function __construct(Model $model, Database $load)
-	{
-		$this->model = $model;
-		$this->load = $load;
-	}
-
-	/**
-	 * Get a value from a given table
-	 *          Example: $this->value(
-	 *                        [
-	 *                           'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-	 *                        ], 'value_key'
-	 *                    );
-	 *
-	 * @param   array      $keys      The item keys
-	 * @param   string     $field     The field key
-	 * @param   string     $table     The table
-	 *
-	 * @return  mixed
-	 * @since 2.0.1
-	 */
-	public function value(array $keys, string $field)
-	{
-		return $this->model->value(
-			$this->load->value(
-				["a.{$field}" => $field],
-				['a' => $this->table],
-				$this->prefix($keys)
-			),
-			$field,
-			$this->table
-		);
-	}
-
-	/**
-	 * Get values from a given table
-	 *          Example: $this->item(
-	 *                        [
-	 *                           'guid' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
-	 *                        ]
-	 *                    );
-	 *
-	 * @param   array    $keys      The item keys
-	 * @param   string   $table     The table
-	 *
-	 * @return  object|null
-	 * @since 2.0.1
-	 */
-	public function item(array $keys): ?object
-	{
-		return $this->model->item(
-			$this->load->item(
-				['all' => 'a.*'],
-				['a' => $this->table],
-				$this->prefix($keys)
-			),
-			$this->table
-		);
-	}
- 
-	/**
-	 * Get values from a given table
-	 *          Example: $this->items(
-	 *                        [
-	 *                           'guid' => [
-	 *                              'operator' => 'IN',
-	 *                              'value' => [''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'', ''xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'']
-	 *                           ]
-	 *                        ]
-	 *                    );
-	 *          Example: $this->items($ids, 'table_name');
-	 *
-	 * @param   array    $keys    The item keys
-	 * @param   string   $table   The table
-	 *
-	 * @return  array|null
-	 * @since 2.0.1
-	 */
-	public function items(array $keys): ?array
-	{
-		return $this->model->items(
-			$this->load->items(
-				['all' => 'a.*'], ['a' => $this->table], $this->prefix($keys)
-			),
-			$this->table
-		);
-	}
-
-	/**
-	 * Add prefix to the keys
-	 *
-	 * @param   array    $keys The query keys
-	 *
-	 * @return  array
-	 * @since 2.0.1
-	 */
-	private function prefix(array &$keys): array
-	{
-		// update the key values
-		$bucket = [];
-		foreach ($keys as $k => $v)
-		{
-			$bucket['a.' . $k] = $v;
-		}
-		return $bucket;
-	}
\ No newline at end of file
+	protected string $table = 'power';
\ No newline at end of file
diff --git a/src/1f86db0f-e271-45df-8795-3e503ec76698/settings.json b/src/1f86db0f-e271-45df-8795-3e503ec76698/settings.json
index 91a10e7..cd07b12 100644
--- a/src/1f86db0f-e271-45df-8795-3e503ec76698/settings.json
+++ b/src/1f86db0f-e271-45df-8795-3e503ec76698/settings.json
@@ -1,28 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "008d111c-9d43-427c-8dd4-2653e8b74be8",
     "guid": "1f86db0f-e271-45df-8795-3e503ec76698",
     "implements": [
-        "99786f53-64b7-4d52-95b0-5306e7386c3f"
+        "c548640c-a461-4424-9ac5-8dfb5ed06d8d"
     ],
     "load_selection": null,
     "name": "Load",
     "power_version": "1.0.0",
-    "system_name": "JCB.Power.Database.Load",
-    "type": "class",
-    "use_selection": {
-        "use_selection0": {
-            "use": "8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff",
-            "as": "Model"
-        },
-        "use_selection1": {
-            "use": "06f8eada-d59b-441c-b287-0aea1793da5a",
-            "as": "Database"
-        }
-    },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Database.Load",
-    "description": "Power Database Load\r\n\r\n@since 2.0.1",
+    "system_name": "JCB.Power.Data.Load",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Data.Load",
+    "description": "Power Data Load\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/README.md b/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/README.md
index 2220c1d..b749b0c 100644
--- a/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/README.md
+++ b/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/README.md
@@ -8,6 +8,7 @@
 ```
 # interface ExternalInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode**
+> extends: ****
 ```uml
 @startuml
 interface ExternalInterface  #Lavender {
diff --git a/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/settings.json b/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/settings.json
index be52679..a4f1a70 100644
--- a/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/settings.json
+++ b/src/1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Customcode.ExternalInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Customcode.ExternalInterface",
     "description": "Customcode External Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/202f748a-516b-4782-962e-ac9725c3cac4/code.php b/src/202f748a-516b-4782-962e-ac9725c3cac4/code.php
index 9545f01..d2eb0ff 100644
--- a/src/202f748a-516b-4782-962e-ac9725c3cac4/code.php
+++ b/src/202f748a-516b-4782-962e-ac9725c3cac4/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/202f748a-516b-4782-962e-ac9725c3cac4/settings.json b/src/202f748a-516b-4782-962e-ac9725c3cac4/settings.json
index 3684a3e..9d4a2ea 100644
--- a/src/202f748a-516b-4782-962e-ac9725c3cac4/settings.json
+++ b/src/202f748a-516b-4782-962e-ac9725c3cac4/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CustomList",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CustomList",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CustomList",
     "description": "Custom List Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/207b5ef3-b3bb-45bf-af14-4572e296d761/code.php b/src/207b5ef3-b3bb-45bf-af14-4572e296d761/code.php
index c81ef7f..4e56ac0 100644
--- a/src/207b5ef3-b3bb-45bf-af14-4572e296d761/code.php
+++ b/src/207b5ef3-b3bb-45bf-af14-4572e296d761/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/207b5ef3-b3bb-45bf-af14-4572e296d761/settings.json b/src/207b5ef3-b3bb-45bf-af14-4572e296d761/settings.json
index ce8498d..921dfc7 100644
--- a/src/207b5ef3-b3bb-45bf-af14-4572e296d761/settings.json
+++ b/src/207b5ef3-b3bb-45bf-af14-4572e296d761/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.FrontendParams",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.FrontendParams",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.FrontendParams",
     "description": "Front-end Params Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/208bc37c-0055-44df-9a34-63d6bfa10765/README.md b/src/208bc37c-0055-44df-9a34-63d6bfa10765/README.md
index 7216ed4..4c816be 100644
--- a/src/208bc37c-0055-44df-9a34-63d6bfa10765/README.md
+++ b/src/208bc37c-0055-44df-9a34-63d6bfa10765/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsCustomfield (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsCustomfield << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/208bc37c-0055-44df-9a34-63d6bfa10765/code.php b/src/208bc37c-0055-44df-9a34-63d6bfa10765/code.php
index 1e5a69a..2c6b68b 100644
--- a/src/208bc37c-0055-44df-9a34-63d6bfa10765/code.php
+++ b/src/208bc37c-0055-44df-9a34-63d6bfa10765/code.php
@@ -16,9 +16,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ConfigFieldsetsCustomfield as Customfield;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ConfigFieldsets;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 
 
diff --git a/src/208bc37c-0055-44df-9a34-63d6bfa10765/settings.json b/src/208bc37c-0055-44df-9a34-63d6bfa10765/settings.json
index 6b16e38..228b45a 100644
--- a/src/208bc37c-0055-44df-9a34-63d6bfa10765/settings.json
+++ b/src/208bc37c-0055-44df-9a34-63d6bfa10765/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "208bc37c-0055-44df-9a34-63d6bfa10765",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsCustomfield",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsCustomfield",
     "description": "Config Fieldsets Customfield Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/README.md b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/README.md
index 381b281..31b6359 100644
--- a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/README.md
+++ b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsets (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsets << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/code.php b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/code.php
index fc2f604..23aaf39 100644
--- a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/code.php
+++ b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/code.php
@@ -28,13 +28,13 @@ use VDM\Joomla\Componentbuilder\Compiler\Creator\ConfigFieldsetsGooglechart;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\ConfigFieldsetsEmailHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\ConfigFieldsetsEncryption;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\ConfigFieldsetsCustomfield;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Utilities\MathHelper;
+use VDM\Joomla\Utilities\MathHelper;
 
 
 /**
diff --git a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/settings.json b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/settings.json
index 1587732..29e3205 100644
--- a/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/settings.json
+++ b/src/20cf1825-29d0-4c6c-8fe9-a1e13a4dac53/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "20cf1825-29d0-4c6c-8fe9-a1e13a4dac53",
     "implements": null,
     "load_selection": null,
@@ -103,7 +103,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsets",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsets",
     "description": "Config Fieldsets Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/README.md b/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/README.md
index 9c096ca..3ae380f 100644
--- a/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/README.md
+++ b/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/README.md
@@ -8,6 +8,7 @@
 ```
 # interface EventInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface EventInterface  #Lavender {
diff --git a/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/settings.json b/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/settings.json
index 02956d8..0d182a7 100644
--- a/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/settings.json
+++ b/src/20ed72b0-fcac-4344-aee1-8a65e3bf221d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "20ed72b0-fcac-4344-aee1-8a65e3bf221d",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.EventInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.EventInterface",
     "description": "Compiler Events Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/README.md b/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/README.md
index d6b3d96..0f95fc5 100644
--- a/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/README.md
+++ b/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanDelete (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaThree\Model**
+> extends: ****
 ```uml
 @startuml
 class CanDelete << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/settings.json b/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/settings.json
index a44d771..0e62824 100644
--- a/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/settings.json
+++ b/src/23766738-d0a4-4d0a-8555-7e4c97c0cddd/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "23766738-d0a4-4d0a-8555-7e4c97c0cddd",
     "implements": [
         "e00a7d1d-6d80-41c5-bf13-32d41bc5bf91"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Model.CanDelete",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Model.CanDelete",
     "description": "Model Can Delete Class for Joomla 3\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/README.md b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/README.md
index 2478920..3d7f282 100644
--- a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/README.md
+++ b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FileInjector (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class FileInjector << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/code.php b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/code.php
index c8faaa3..eaf28e2 100644
--- a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/code.php
+++ b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 use VDM\Joomla\Componentbuilder\Compiler\Power\Injector as Power;
 use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Injector as JoomlaPower;
-use VastDevelopmentMethod\Joomla\Utilities\MathHelper;
+use VDM\Joomla\Utilities\MathHelper;
 
 
 /**
diff --git a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/settings.json b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/settings.json
index d28fe13..fac563a 100644
--- a/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/settings.json
+++ b/src/23f2ca33-440a-4941-8e9a-4bc67522c0cb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "23f2ca33-440a-4941-8e9a-4bc67522c0cb",
     "implements": null,
     "load_selection": null,
@@ -23,6 +23,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.FileInjector",
     "description": "File Injector\r\n   Thanks to http:\/\/stackoverflow.com\/a\/16813550\/1429677\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/README.md b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/README.md
index f7fa6e0..b0552f5 100644
--- a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/README.md
+++ b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreRule (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class CoreRule << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/code.php b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/code.php
index bbdd6e6..378f9f9 100644
--- a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/code.php
+++ b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface;
 
 
diff --git a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/settings.json b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/settings.json
index fc9ff2b..a628f6c 100644
--- a/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/settings.json
+++ b/src/24da9672-e47f-4bb1-b6c0-0ebfc17f0957/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "24da9672-e47f-4bb1-b6c0-0ebfc17f0957",
     "implements": [
         "b9f05dc4-d23a-499a-a826-9749b81818ed"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.CoreRule",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.CoreRule",
     "description": "Core Joomla Field Rules\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/code.php b/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/code.php
index f41e6b5..401795b 100644
--- a/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/code.php
+++ b/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/settings.json b/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/settings.json
index b3822a6..381d7cf 100644
--- a/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/settings.json
+++ b/src/2528f2bb-6ebc-4d55-9a9d-23ef58534c1a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.PermissionAction",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionAction",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionAction",
     "description": "Permission Actions Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/README.md b/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/README.md
index 47ef2ac..96e0798 100644
--- a/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/README.md
+++ b/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/README.md
@@ -8,6 +8,7 @@
 ```
 # class Library (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Library  #Gold {
diff --git a/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/settings.json b/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/settings.json
index 6fc8a8f..4bfd0bd 100644
--- a/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/settings.json
+++ b/src/253317c7-3c3b-48a0-aec8-8af5e7a86504/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "253317c7-3c3b-48a0-aec8-8af5e7a86504",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Library",
     "description": "Compiler Library\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/README.md b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/README.md
index f14d329..b89850e 100644
--- a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/README.md
+++ b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/README.md
@@ -8,6 +8,7 @@
 ```
 # final class History (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class History << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/code.php b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/code.php
index 1925caf..0412672 100644
--- a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/code.php
+++ b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFour;
 
 use Joomla\CMS\Factory;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HistoryInterface;
 
diff --git a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/settings.json b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/settings.json
index acd2448..e4a1c0a 100644
--- a/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/settings.json
+++ b/src/25c7ca86-6088-4f5f-b9fe-13504779c6ba/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "25c7ca86-6088-4f5f-b9fe-13504779c6ba",
     "implements": [
         "4325745f-da1f-4d4d-a591-3189fe8c06e5"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFour.History",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFour.History",
     "description": "Compiler History\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/README.md b/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/README.md
index 74aaf58..5c7b60f 100644
--- a/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/README.md
+++ b/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/README.md
@@ -8,6 +8,7 @@
 ```
 # class Dynamicpath (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Dynamicpath  #Gold {
diff --git a/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/settings.json b/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/settings.json
index 3969bfe..4738c73 100644
--- a/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/settings.json
+++ b/src/268b85ef-49f3-4c39-8187-bb12e38d19ee/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "268b85ef-49f3-4c39-8187-bb12e38d19ee",
     "implements": null,
     "load_selection": null,
@@ -23,6 +23,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Dynamicpath",
     "description": "Compiler Utilities Dynamic Path\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/274a78d1-24c2-4486-b560-b86e9ae72872/code.php b/src/274a78d1-24c2-4486-b560-b86e9ae72872/code.php
index 9c8edca..80bdc07 100644
--- a/src/274a78d1-24c2-4486-b560-b86e9ae72872/code.php
+++ b/src/274a78d1-24c2-4486-b560-b86e9ae72872/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/274a78d1-24c2-4486-b560-b86e9ae72872/settings.json b/src/274a78d1-24c2-4486-b560-b86e9ae72872/settings.json
index a965a29..70af82a 100644
--- a/src/274a78d1-24c2-4486-b560-b86e9ae72872/settings.json
+++ b/src/274a78d1-24c2-4486-b560-b86e9ae72872/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Contributors",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Contributors",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Contributors",
     "description": "Contributors Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/28cac2bb-df04-454f-b4d6-923b573eb94e/code.php b/src/28cac2bb-df04-454f-b4d6-923b573eb94e/code.php
index 5d6d2fc..0994220 100644
--- a/src/28cac2bb-df04-454f-b4d6-923b573eb94e/code.php
+++ b/src/28cac2bb-df04-454f-b4d6-923b573eb94e/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/28cac2bb-df04-454f-b4d6-923b573eb94e/settings.json b/src/28cac2bb-df04-454f-b4d6-923b573eb94e/settings.json
index f03d616..9966661 100644
--- a/src/28cac2bb-df04-454f-b4d6-923b573eb94e/settings.json
+++ b/src/28cac2bb-df04-454f-b4d6-923b573eb94e/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ModelWhmcsField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ModelWhmcsField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ModelWhmcsField",
     "description": "Whmcs Field Model Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/29455d3b-df2b-4e41-8684-1608060e37a4/README.md b/src/29455d3b-df2b-4e41-8684-1608060e37a4/README.md
index 59858b9..6371e0c 100644
--- a/src/29455d3b-df2b-4e41-8684-1608060e37a4/README.md
+++ b/src/29455d3b-df2b-4e41-8684-1608060e37a4/README.md
@@ -8,6 +8,7 @@
 ```
 # class Javascriptcustomview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Javascriptcustomview  #Gold {
diff --git a/src/29455d3b-df2b-4e41-8684-1608060e37a4/code.php b/src/29455d3b-df2b-4e41-8684-1608060e37a4/code.php
index 62a3674..8088481 100644
--- a/src/29455d3b-df2b-4e41-8684-1608060e37a4/code.php
+++ b/src/29455d3b-df2b-4e41-8684-1608060e37a4/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/29455d3b-df2b-4e41-8684-1608060e37a4/settings.json b/src/29455d3b-df2b-4e41-8684-1608060e37a4/settings.json
index 35002d3..8d89d87 100644
--- a/src/29455d3b-df2b-4e41-8684-1608060e37a4/settings.json
+++ b/src/29455d3b-df2b-4e41-8684-1608060e37a4/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "29455d3b-df2b-4e41-8684-1608060e37a4",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Javascriptcustomview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Javascriptcustomview",
     "description": "Model Javascript Custom View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/295186de-5954-4a65-a4c1-2f79ef305743/README.md b/src/295186de-5954-4a65-a4c1-2f79ef305743/README.md
index 3a755af..57ba601 100644
--- a/src/295186de-5954-4a65-a4c1-2f79ef305743/README.md
+++ b/src/295186de-5954-4a65-a4c1-2f79ef305743/README.md
@@ -8,6 +8,7 @@
 ```
 # class Joomlamodule (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Joomlamodule  #Gold {
diff --git a/src/295186de-5954-4a65-a4c1-2f79ef305743/settings.json b/src/295186de-5954-4a65-a4c1-2f79ef305743/settings.json
index 15fa9f3..c1bfc0e 100644
--- a/src/295186de-5954-4a65-a4c1-2f79ef305743/settings.json
+++ b/src/295186de-5954-4a65-a4c1-2f79ef305743/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "295186de-5954-4a65-a4c1-2f79ef305743",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Joomlamodule",
     "description": "Joomla Module Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/README.md b/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/README.md
index fb78f07..d43c9a9 100644
--- a/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/README.md
+++ b/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanDelete (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFour\Model**
+> extends: ****
 ```uml
 @startuml
 class CanDelete << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/settings.json b/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/settings.json
index 059fcc2..2890776 100644
--- a/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/settings.json
+++ b/src/2a69a8ab-cea0-4c75-92d5-9495cb740e0f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2a69a8ab-cea0-4c75-92d5-9495cb740e0f",
     "implements": [
         "e00a7d1d-6d80-41c5-bf13-32d41bc5bf91"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Model.CanDelete",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Model.CanDelete",
     "description": "Model Can Delete Class for Joomla 4\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/code.php b/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/code.php
index 499d9fb..431383d 100644
--- a/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/code.php
+++ b/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/settings.json b/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/settings.json
index 9fdde72..4cb0907 100644
--- a/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/settings.json
+++ b/src/2b5c9989-1d4e-4f59-8b95-5cd2f72f82d9/settings.json
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Builder.UpdateMysql",
     "type": "class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.UpdateMysql",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.UpdateMysql",
     "description": "Compiler Builder Update Mysql\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/README.md b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/README.md
index 6c1cd82..46df935 100644
--- a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/README.md
+++ b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InputButton (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class InputButton << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/code.php b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/code.php
index d53ee8d..4d02833 100644
--- a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/code.php
+++ b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Permission;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
diff --git a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/settings.json b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/settings.json
index f5b08b0..ba245b0 100644
--- a/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/settings.json
+++ b/src/2bc33733-e900-4a9c-8cb3-c537aa9db785/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2bc33733-e900-4a9c-8cb3-c537aa9db785",
     "implements": [
         "c600f58c-3fe2-4d2d-b711-2660eab6effe"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.InputButton",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.InputButton",
     "description": "Compiler Field Input Button\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/README.md b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/README.md
index ff4ac62..15d0a53 100644
--- a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/README.md
+++ b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/README.md
@@ -8,10 +8,12 @@
 ```
 # class BuilderLZ (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class BuilderLZ  #Gold {
   + register(Container $container) : void
+  + getLanguages(Container $container) : Languages
   + getLanguageMessages(Container $container) : LanguageMessages
   + getLayout(Container $container) : Layout
   + getLayoutData(Container $container) : LayoutData
@@ -74,371 +76,378 @@ note right of BuilderLZ::register
   return: void
 end note
 
-note left of BuilderLZ::getLanguageMessages
+note left of BuilderLZ::getLanguages
+  Get The Languages Class.
+
+  since: 3.2.0
+  return: Languages
+end note
+
+note right of BuilderLZ::getLanguageMessages
   Get The LanguageMessages Class.
 
   since: 3.2.0
   return: LanguageMessages
 end note
 
-note right of BuilderLZ::getLayout
+note left of BuilderLZ::getLayout
   Get The Layout Class.
 
   since: 3.2.0
   return: Layout
 end note
 
-note left of BuilderLZ::getLayoutData
+note right of BuilderLZ::getLayoutData
   Get The LayoutData Class.
 
   since: 3.2.0
   return: LayoutData
 end note
 
-note right of BuilderLZ::getLibraryManager
+note left of BuilderLZ::getLibraryManager
   Get The LibraryManager Class.
 
   since: 3.2.0
   return: LibraryManager
 end note
 
-note left of BuilderLZ::getListFieldClass
+note right of BuilderLZ::getListFieldClass
   Get The ListFieldClass Class.
 
   since: 3.2.0
   return: ListFieldClass
 end note
 
-note right of BuilderLZ::getListHeadOverride
+note left of BuilderLZ::getListHeadOverride
   Get The ListHeadOverride Class.
 
   since: 3.2.0
   return: ListHeadOverride
 end note
 
-note left of BuilderLZ::getListJoin
+note right of BuilderLZ::getListJoin
   Get The ListJoin Class.
 
   since: 3.2.0
   return: ListJoin
 end note
 
-note right of BuilderLZ::getLists
+note left of BuilderLZ::getLists
   Get The Lists Class.
 
   since: 3.2.0
   return: Lists
 end note
 
-note left of BuilderLZ::getMainTextField
+note right of BuilderLZ::getMainTextField
   Get The MainTextField Class.
 
   since: 3.2.0
   return: MainTextField
 end note
 
-note right of BuilderLZ::getMetaData
+note left of BuilderLZ::getMetaData
   Get The MetaData Class.
 
   since: 3.2.0
   return: MetaData
 end note
 
-note left of BuilderLZ::getModelBasicField
+note right of BuilderLZ::getModelBasicField
   Get The ModelBasicField Class.
 
   since: 3.2.0
   return: ModelBasicField
 end note
 
-note right of BuilderLZ::getModelExpertField
+note left of BuilderLZ::getModelExpertField
   Get The ModelExpertField Class.
 
   since: 3.2.0
   return: ModelExpertField
 end note
 
-note left of BuilderLZ::getModelExpertFieldInitiator
+note right of BuilderLZ::getModelExpertFieldInitiator
   Get The ModelExpertFieldInitiator Class.
 
   since: 3.2.0
   return: ModelExpertFieldInitiator
 end note
 
-note right of BuilderLZ::getModelMediumField
+note left of BuilderLZ::getModelMediumField
   Get The ModelMediumField Class.
 
   since: 3.2.0
   return: ModelMediumField
 end note
 
-note left of BuilderLZ::getModelWhmcsField
+note right of BuilderLZ::getModelWhmcsField
   Get The ModelWhmcsField Class.
 
   since: 3.2.0
   return: ModelWhmcsField
 end note
 
-note right of BuilderLZ::getMovedPublishingFields
+note left of BuilderLZ::getMovedPublishingFields
   Get The MovedPublishingFields Class.
 
   since: 3.2.0
   return: MovedPublishingFields
 end note
 
-note left of BuilderLZ::getMysqlTableSetting
+note right of BuilderLZ::getMysqlTableSetting
   Get The MysqlTableSetting Class.
 
   since: 3.2.0
   return: MysqlTableSetting
 end note
 
-note right of BuilderLZ::getNewPublishingFields
+note left of BuilderLZ::getNewPublishingFields
   Get The NewPublishingFields Class.
 
   since: 3.2.0
   return: NewPublishingFields
 end note
 
-note left of BuilderLZ::getOrderZero
+note right of BuilderLZ::getOrderZero
   Get The OrderZero Class.
 
   since: 3.2.0
   return: OrderZero
 end note
 
-note right of BuilderLZ::getOtherFilter
+note left of BuilderLZ::getOtherFilter
   Get The OtherFilter Class.
 
   since: 3.2.0
   return: OtherFilter
 end note
 
-note left of BuilderLZ::getOtherGroup
+note right of BuilderLZ::getOtherGroup
   Get The OtherGroup Class.
 
   since: 3.2.0
   return: OtherGroup
 end note
 
-note right of BuilderLZ::getOtherJoin
+note left of BuilderLZ::getOtherJoin
   Get The OtherJoin Class.
 
   since: 3.2.0
   return: OtherJoin
 end note
 
-note left of BuilderLZ::getOtherOrder
+note right of BuilderLZ::getOtherOrder
   Get The OtherOrder Class.
 
   since: 3.2.0
   return: OtherOrder
 end note
 
-note right of BuilderLZ::getOtherQuery
+note left of BuilderLZ::getOtherQuery
   Get The OtherQuery Class.
 
   since: 3.2.0
   return: OtherQuery
 end note
 
-note left of BuilderLZ::getOtherWhere
+note right of BuilderLZ::getOtherWhere
   Get The OtherWhere Class.
 
   since: 3.2.0
   return: OtherWhere
 end note
 
-note right of BuilderLZ::getPermissionAction
+note left of BuilderLZ::getPermissionAction
   Get The PermissionAction Class.
 
   since: 3.2.0
   return: PermissionAction
 end note
 
-note left of BuilderLZ::getPermissionComponent
+note right of BuilderLZ::getPermissionComponent
   Get The PermissionComponent Class.
 
   since: 3.2.0
   return: PermissionComponent
 end note
 
-note right of BuilderLZ::getPermissionCore
+note left of BuilderLZ::getPermissionCore
   Get The PermissionCore Class.
 
   since: 3.2.0
   return: PermissionCore
 end note
 
-note left of BuilderLZ::getPermissionDashboard
+note right of BuilderLZ::getPermissionDashboard
   Get The PermissionDashboard Class.
 
   since: 3.2.0
   return: PermissionDashboard
 end note
 
-note right of BuilderLZ::getPermissionFields
+note left of BuilderLZ::getPermissionFields
   Get The PermissionFields Class.
 
   since: 3.2.0
   return: PermissionFields
 end note
 
-note left of BuilderLZ::getPermissionGlobalAction
+note right of BuilderLZ::getPermissionGlobalAction
   Get The PermissionGlobalAction Class.
 
   since: 3.2.0
   return: PermissionGlobalAction
 end note
 
-note right of BuilderLZ::getPermissionViews
+note left of BuilderLZ::getPermissionViews
   Get The PermissionViews Class.
 
   since: 3.2.0
   return: PermissionViews
 end note
 
-note left of BuilderLZ::getRequest
+note right of BuilderLZ::getRequest
   Get The Request Class.
 
   since: 3.2.0
   return: Request
 end note
 
-note right of BuilderLZ::getRouter
+note left of BuilderLZ::getRouter
   Get The Router Class.
 
   since: 3.2.0
   return: Router
 end note
 
-note left of BuilderLZ::getScriptMediaSwitch
+note right of BuilderLZ::getScriptMediaSwitch
   Get The ScriptMediaSwitch Class.
 
   since: 3.2.0
   return: ScriptMediaSwitch
 end note
 
-note right of BuilderLZ::getScriptUserSwitch
+note left of BuilderLZ::getScriptUserSwitch
   Get The ScriptUserSwitch Class.
 
   since: 3.2.0
   return: ScriptUserSwitch
 end note
 
-note left of BuilderLZ::getSearch
+note right of BuilderLZ::getSearch
   Get The Search Class.
 
   since: 3.2.0
   return: Search
 end note
 
-note right of BuilderLZ::getSelectionTranslation
+note left of BuilderLZ::getSelectionTranslation
   Get The SelectionTranslation Class.
 
   since: 3.2.0
   return: SelectionTranslation
 end note
 
-note left of BuilderLZ::getSiteDecrypt
+note right of BuilderLZ::getSiteDecrypt
   Get The SiteDecrypt Class.
 
   since: 3.2.0
   return: SiteDecrypt
 end note
 
-note right of BuilderLZ::getSiteDynamicGet
+note left of BuilderLZ::getSiteDynamicGet
   Get The SiteDynamicGet Class.
 
   since: 3.2.0
   return: SiteDynamicGet
 end note
 
-note left of BuilderLZ::getSiteEditView
+note right of BuilderLZ::getSiteEditView
   Get The SiteEditView Class.
 
   since: 3.2.0
   return: SiteEditView
 end note
 
-note right of BuilderLZ::getSiteFieldData
+note left of BuilderLZ::getSiteFieldData
   Get The SiteFieldData Class.
 
   since: 3.2.0
   return: SiteFieldData
 end note
 
-note left of BuilderLZ::getSiteFieldDecodeFilter
+note right of BuilderLZ::getSiteFieldDecodeFilter
   Get The SiteFieldDecodeFilter Class.
 
   since: 3.2.0
   return: SiteFieldDecodeFilter
 end note
 
-note right of BuilderLZ::getSiteFields
+note left of BuilderLZ::getSiteFields
   Get The SiteFields Class.
 
   since: 3.2.0
   return: SiteFields
 end note
 
-note left of BuilderLZ::getSiteMainGet
+note right of BuilderLZ::getSiteMainGet
   Get The SiteMainGet Class.
 
   since: 3.2.0
   return: SiteMainGet
 end note
 
-note right of BuilderLZ::getSort
+note left of BuilderLZ::getSort
   Get The Sort Class.
 
   since: 3.2.0
   return: Sort
 end note
 
-note left of BuilderLZ::getTabCounter
+note right of BuilderLZ::getTabCounter
   Get The TabCounter Class.
 
   since: 3.2.0
   return: TabCounter
 end note
 
-note right of BuilderLZ::getTags
+note left of BuilderLZ::getTags
   Get The Tags Class.
 
   since: 3.2.0
   return: Tags
 end note
 
-note left of BuilderLZ::getTemplateData
+note right of BuilderLZ::getTemplateData
   Get The TemplateData Class.
 
   since: 3.2.0
   return: TemplateData
 end note
 
-note right of BuilderLZ::getTitle
+note left of BuilderLZ::getTitle
   Get The Title Class.
 
   since: 3.2.0
   return: Title
 end note
 
-note left of BuilderLZ::getUikitComp
+note right of BuilderLZ::getUikitComp
   Get The UikitComp Class.
 
   since: 3.2.0
   return: UikitComp
 end note
 
-note right of BuilderLZ::getUpdateMysql
+note left of BuilderLZ::getUpdateMysql
   Get The UpdateMysql Class.
 
   since: 3.2.0
   return: UpdateMysql
 end note
 
-note left of BuilderLZ::getViewsDefaultOrdering
+note right of BuilderLZ::getViewsDefaultOrdering
   Get The ViewsDefaultOrdering Class.
 
   since: 3.2.0
diff --git a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.php b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.php
index b6421dd..6a8a6a6 100644
--- a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.php
+++ b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.php
@@ -14,6 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
+use VDM\Joomla\Componentbuilder\Compiler\Builder\Languages;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\LanguageMessages;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Layout;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\LayoutData;
@@ -86,6 +87,9 @@ class BuilderLZ implements ServiceProviderInterface
 	 */
 	public function register(Container $container)
 	{
+		$container->alias(Languages::class, 'Compiler.Builder.Languages')
+			->share('Compiler.Builder.Languages', [$this, 'getLanguages'], true);
+
 		$container->alias(LanguageMessages::class, 'Compiler.Builder.Language.Messages')
 			->share('Compiler.Builder.Language.Messages', [$this, 'getLanguageMessages'], true);
 
@@ -246,6 +250,19 @@ class BuilderLZ implements ServiceProviderInterface
 			->share('Compiler.Builder.Views.Default.Ordering', [$this, 'getViewsDefaultOrdering'], true);
 	}
 
+	/**
+	 * Get The Languages Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Languages
+	 * @since 3.2.0
+	 */
+	public function getLanguages(Container $container): Languages
+	{
+		return new Languages();
+	}
+
 	/**
 	 * Get The LanguageMessages Class.
 	 *
diff --git a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.power b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.power
index 9aa1110..94aabe5 100644
--- a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.power
+++ b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/code.power
@@ -8,6 +8,9 @@
 	 */
 	public function register(Container $container)
 	{
+		$container->alias(Languages::class, 'Compiler.Builder.Languages')
+			->share('Compiler.Builder.Languages', [$this, 'getLanguages'], true);
+
 		$container->alias(LanguageMessages::class, 'Compiler.Builder.Language.Messages')
 			->share('Compiler.Builder.Language.Messages', [$this, 'getLanguageMessages'], true);
 
@@ -168,6 +171,19 @@
 			->share('Compiler.Builder.Views.Default.Ordering', [$this, 'getViewsDefaultOrdering'], true);
 	}
 
+	/**
+	 * Get The Languages Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Languages
+	 * @since 3.2.0
+	 */
+	public function getLanguages(Container $container): Languages
+	{
+		return new Languages();
+	}
+
 	/**
 	 * Get The LanguageMessages Class.
 	 *
diff --git a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/settings.json b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/settings.json
index 523a5ff..fad9df1 100644
--- a/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/settings.json
+++ b/src/2c76c06e-a371-4b73-9fbe-b4d9b4df55d7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2c76c06e-a371-4b73-9fbe-b4d9b4df55d7",
     "implements": [
         "-1"
@@ -12,6 +12,10 @@
     "system_name": "JCB.Compiler.Service.BuilderLZ",
     "type": "class",
     "use_selection": {
+        "use_selection53": {
+            "use": "7526a39a-ada3-4499-8d75-81beff33f949",
+            "as": "default"
+        },
         "use_selection0": {
             "use": "44efa649-736d-4656-a0ec-e4f1653a6742",
             "as": "default"
@@ -225,6 +229,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.BuilderLZ",
     "description": "Builder L-Z Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/2cb33994-052e-42dd-adbc-3ea9f932816f/code.php b/src/2cb33994-052e-42dd-adbc-3ea9f932816f/code.php
index bdd75d0..a9a4d8d 100644
--- a/src/2cb33994-052e-42dd-adbc-3ea9f932816f/code.php
+++ b/src/2cb33994-052e-42dd-adbc-3ea9f932816f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/2cb33994-052e-42dd-adbc-3ea9f932816f/settings.json b/src/2cb33994-052e-42dd-adbc-3ea9f932816f/settings.json
index ac12c99..7031385 100644
--- a/src/2cb33994-052e-42dd-adbc-3ea9f932816f/settings.json
+++ b/src/2cb33994-052e-42dd-adbc-3ea9f932816f/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.History",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.History",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.History",
     "description": "History Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2cc8517d-1105-4697-9743-048b4b7c089c/README.md b/src/2cc8517d-1105-4697-9743-048b4b7c089c/README.md
index fb2aea8..fa52c0f 100644
--- a/src/2cc8517d-1105-4697-9743-048b4b7c089c/README.md
+++ b/src/2cc8517d-1105-4697-9743-048b4b7c089c/README.md
@@ -8,6 +8,7 @@
 ```
 # interface GuiInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode**
+> extends: ****
 ```uml
 @startuml
 interface GuiInterface  #Lavender {
diff --git a/src/2cc8517d-1105-4697-9743-048b4b7c089c/settings.json b/src/2cc8517d-1105-4697-9743-048b4b7c089c/settings.json
index 6584408..c28a2ba 100644
--- a/src/2cc8517d-1105-4697-9743-048b4b7c089c/settings.json
+++ b/src/2cc8517d-1105-4697-9743-048b4b7c089c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2cc8517d-1105-4697-9743-048b4b7c089c",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Customcode.GuiInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Customcode.GuiInterface",
     "description": "Customcode Gui Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/2d27c436-4d8e-4692-8382-d9e97af2231c/README.md b/src/2d27c436-4d8e-4692-8382-d9e97af2231c/README.md
index 83896d3..065ced6 100644
--- a/src/2d27c436-4d8e-4692-8382-d9e97af2231c/README.md
+++ b/src/2d27c436-4d8e-4692-8382-d9e97af2231c/README.md
@@ -8,6 +8,7 @@
 ```
 # interface Fieldtypeinterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator**
+> extends: ****
 ```uml
 @startuml
 interface Fieldtypeinterface  #Lavender {
diff --git a/src/2d27c436-4d8e-4692-8382-d9e97af2231c/settings.json b/src/2d27c436-4d8e-4692-8382-d9e97af2231c/settings.json
index a2fcad4..ae6a9d8 100644
--- a/src/2d27c436-4d8e-4692-8382-d9e97af2231c/settings.json
+++ b/src/2d27c436-4d8e-4692-8382-d9e97af2231c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2d27c436-4d8e-4692-8382-d9e97af2231c",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Interfaces.Creator.Fieldtypeinterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fieldtypeinterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fieldtypeinterface",
     "description": "Field (Types) Creator Interface (needed for the container)\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/README.md b/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/README.md
index 9b38d83..8927ba5 100644
--- a/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/README.md
+++ b/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/README.md
@@ -8,6 +8,7 @@
 ```
 # class Adminview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Adminview  #Gold {
diff --git a/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/settings.json b/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/settings.json
index 0f43fd4..fe7b8cd 100644
--- a/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/settings.json
+++ b/src/2dd1289a-4000-43cc-8c62-77ff32de56bf/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2dd1289a-4000-43cc-8c62-77ff32de56bf",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Adminview",
     "description": "Compiler Adminview\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/README.md b/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/README.md
index 902f571..b2599fc 100644
--- a/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/README.md
+++ b/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/README.md
@@ -8,6 +8,7 @@
 ```
 # interface GetScriptInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface GetScriptInterface  #Lavender {
diff --git a/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/settings.json b/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/settings.json
index 7ac48a1..49f93fb 100644
--- a/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/settings.json
+++ b/src/2e6731ba-3a03-4836-b2c2-4e50e38cb890/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2e6731ba-3a03-4836-b2c2-4e50e38cb890",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.GetScriptInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.GetScriptInterface",
     "description": "The functions a get script should have\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/2e764839-8ec6-4726-af50-b5678e0714a4/code.php b/src/2e764839-8ec6-4726-af50-b5678e0714a4/code.php
index 8eb05e1..8fffb1f 100644
--- a/src/2e764839-8ec6-4726-af50-b5678e0714a4/code.php
+++ b/src/2e764839-8ec6-4726-af50-b5678e0714a4/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/2e764839-8ec6-4726-af50-b5678e0714a4/settings.json b/src/2e764839-8ec6-4726-af50-b5678e0714a4/settings.json
index 0c3f067..3f9198f 100644
--- a/src/2e764839-8ec6-4726-af50-b5678e0714a4/settings.json
+++ b/src/2e764839-8ec6-4726-af50-b5678e0714a4/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Search",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Search",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Search",
     "description": "Search Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/README.md b/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/README.md
index 128ea04..2b71d07 100644
--- a/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/README.md
+++ b/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Placeholder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Placeholder  #Gold {
diff --git a/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/settings.json b/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/settings.json
index b6423fb..340136b 100644
--- a/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/settings.json
+++ b/src/2f7b1998-bb93-4055-ae82-aa659ce8a37f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "2f7b1998-bb93-4055-ae82-aa659ce8a37f",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Placeholder",
     "description": "Compiler Placeholder Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/README.md b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/README.md
index 9942335..6df9e50 100644
--- a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/README.md
+++ b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customcode (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class Customcode  #Gold {
diff --git a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/code.php b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/code.php
index d309387..0bbcae8 100644
--- a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/code.php
+++ b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/code.php
@@ -21,9 +21,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Power\Extractor as Power;
 use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Extractor as JoomlaPower;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\External;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\CustomcodeInterface;
 
 
diff --git a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/settings.json b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/settings.json
index 1236651..bbcc844 100644
--- a/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/settings.json
+++ b/src/313b43c4-98c3-4f62-9177-2d73ec8eba31/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "313b43c4-98c3-4f62-9177-2d73ec8eba31",
     "implements": [
         "33bdc535-0ff1-40c8-bb22-b5d44f1731c4"
@@ -57,7 +57,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode",
     "description": "Compiler Custom Code\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/318a98a3-bb6f-42cb-a000-352d4c848b51/README.md b/src/318a98a3-bb6f-42cb-a000-352d4c848b51/README.md
index c2c0c15..32c7794 100644
--- a/src/318a98a3-bb6f-42cb-a000-352d4c848b51/README.md
+++ b/src/318a98a3-bb6f-42cb-a000-352d4c848b51/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanEditState (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFive\Model**
+> extends: ****
 ```uml
 @startuml
 class CanEditState << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/318a98a3-bb6f-42cb-a000-352d4c848b51/settings.json b/src/318a98a3-bb6f-42cb-a000-352d4c848b51/settings.json
index 6fb70db..10f5969 100644
--- a/src/318a98a3-bb6f-42cb-a000-352d4c848b51/settings.json
+++ b/src/318a98a3-bb6f-42cb-a000-352d4c848b51/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "318a98a3-bb6f-42cb-a000-352d4c848b51",
     "implements": [
         "600515b1-493f-4448-96fe-018e54e087c8"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Model.CanEditState",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Model.CanEditState",
     "description": "Model Can Edit State Class for Joomla 5\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/README.md b/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/README.md
index 3e8909e..60edc9b 100644
--- a/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/README.md
+++ b/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsGooglechart (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsGooglechart << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/settings.json b/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/settings.json
index eaff7c5..7e2d5bf 100644
--- a/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/settings.json
+++ b/src/31c8127c-0d42-4e09-be81-7cf243c5b30f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "31c8127c-0d42-4e09-be81-7cf243c5b30f",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGooglechart",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGooglechart",
     "description": "Config Fieldsets Googlechart Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/code.php b/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/code.php
index 27560fa..725346f 100644
--- a/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/code.php
+++ b/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\VarExport;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\VarExport;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/settings.json b/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/settings.json
index fc4c5f8..6fc9dc7 100644
--- a/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/settings.json
+++ b/src/3230dd65-6590-4043-9bb8-bebd6d8224b2/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ComponentFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ComponentFields",
     "description": "Component Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/README.md b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/README.md
index 1a21796..09927f3 100644
--- a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/README.md
+++ b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/README.md
@@ -8,6 +8,7 @@
 ```
 # class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Structure  #Gold {
diff --git a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/code.php b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/code.php
index f54d2ff..da6862d 100644
--- a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/code.php
+++ b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/code.php
@@ -25,11 +25,11 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Folder;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\File;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Files;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\FileHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 
 
diff --git a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/settings.json b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/settings.json
index 7af7d81..18872e7 100644
--- a/src/324566de-0f7d-4b6e-9caf-8424d55013ae/settings.json
+++ b/src/324566de-0f7d-4b6e-9caf-8424d55013ae/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "324566de-0f7d-4b6e-9caf-8424d55013ae",
     "implements": null,
     "load_selection": null,
@@ -75,6 +75,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Structure",
     "description": "Power Structure Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/README.md b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/README.md
index 6faf8ad..01192f9 100644
--- a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/README.md
+++ b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/README.md
@@ -8,6 +8,7 @@
 ```
 # class Csscustomview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Csscustomview  #Gold {
diff --git a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/code.php b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/code.php
index 536b6f8..6dcdc3d 100644
--- a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/code.php
+++ b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/settings.json b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/settings.json
index f109356..e67a8c8 100644
--- a/src/3283a89c-329a-47fb-a011-0df6c31a5c73/settings.json
+++ b/src/3283a89c-329a-47fb-a011-0df6c31a5c73/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "3283a89c-329a-47fb-a011-0df6c31a5c73",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Csscustomview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Csscustomview",
     "description": "Model Css Custom View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/README.md b/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/README.md
index 2c9beb5..6fc8668 100644
--- a/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/README.md
+++ b/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CustomcodeInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface CustomcodeInterface  #Lavender {
diff --git a/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/settings.json b/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/settings.json
index 57cf893..34a094d 100644
--- a/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/settings.json
+++ b/src/33bdc535-0ff1-40c8-bb22-b5d44f1731c4/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "33bdc535-0ff1-40c8-bb22-b5d44f1731c4",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.CustomcodeInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.CustomcodeInterface",
     "description": "Compiler Customcode Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/33f5131e-4a5b-414b-95dd-d22227c2666d/code.php b/src/33f5131e-4a5b-414b-95dd-d22227c2666d/code.php
index 03db25d..0e4c01c 100644
--- a/src/33f5131e-4a5b-414b-95dd-d22227c2666d/code.php
+++ b/src/33f5131e-4a5b-414b-95dd-d22227c2666d/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\InArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\InArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/33f5131e-4a5b-414b-95dd-d22227c2666d/settings.json b/src/33f5131e-4a5b-414b-95dd-d22227c2666d/settings.json
index a39a9a2..1efe532 100644
--- a/src/33f5131e-4a5b-414b-95dd-d22227c2666d/settings.json
+++ b/src/33f5131e-4a5b-414b-95dd-d22227c2666d/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteFieldData",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteFieldData",
     "description": "Site Field Data Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/3468b447-a929-4c28-84a1-f2c3a27e3127/code.php b/src/3468b447-a929-4c28-84a1-f2c3a27e3127/code.php
index d11d73f..236164e 100644
--- a/src/3468b447-a929-4c28-84a1-f2c3a27e3127/code.php
+++ b/src/3468b447-a929-4c28-84a1-f2c3a27e3127/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/3468b447-a929-4c28-84a1-f2c3a27e3127/settings.json b/src/3468b447-a929-4c28-84a1-f2c3a27e3127/settings.json
index 625a446..a3f74ce 100644
--- a/src/3468b447-a929-4c28-84a1-f2c3a27e3127/settings.json
+++ b/src/3468b447-a929-4c28-84a1-f2c3a27e3127/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ModelExpertFieldInitiator",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ModelExpertFieldInitiator",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ModelExpertFieldInitiator",
     "description": "Expert Field Initiator Model Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/34df20ec-67db-4e7e-be61-fb94d360c408/README.md b/src/34df20ec-67db-4e7e-be61-fb94d360c408/README.md
index b808fc2..d863c9a 100644
--- a/src/34df20ec-67db-4e7e-be61-fb94d360c408/README.md
+++ b/src/34df20ec-67db-4e7e-be61-fb94d360c408/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanDelete (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFive\Model**
+> extends: ****
 ```uml
 @startuml
 class CanDelete << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/34df20ec-67db-4e7e-be61-fb94d360c408/settings.json b/src/34df20ec-67db-4e7e-be61-fb94d360c408/settings.json
index 07cc99f..0c37222 100644
--- a/src/34df20ec-67db-4e7e-be61-fb94d360c408/settings.json
+++ b/src/34df20ec-67db-4e7e-be61-fb94d360c408/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "34df20ec-67db-4e7e-be61-fb94d360c408",
     "implements": [
         "e00a7d1d-6d80-41c5-bf13-32d41bc5bf91"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Model.CanDelete",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Model.CanDelete",
     "description": "Model Can Delete Class for Joomla 5\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/README.md b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/README.md
index 9099651..fa082cc 100644
--- a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/README.md
+++ b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/README.md
@@ -8,6 +8,7 @@
 ```
 # class Mysqlsettings (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Mysqlsettings  #Gold {
diff --git a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/code.php b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/code.php
index 2ac9731..f626ffd 100644
--- a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/code.php
+++ b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\MysqlTableSetting;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/settings.json b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/settings.json
index 4632eab..e6a91df 100644
--- a/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/settings.json
+++ b/src/35191b0c-f7f3-44d6-8ec1-c816b997bd4e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "35191b0c-f7f3-44d6-8ec1-c816b997bd4e",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Mysqlsettings",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Mysqlsettings",
     "description": "Model MySQL Settings Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/README.md b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/README.md
index c09270f..c4c9a0f 100644
--- a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/README.md
+++ b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/README.md
@@ -14,9 +14,9 @@
 class Grep << (F,LightGreen) >> #RoyalBlue {
   # array $order
   # remoteIndex(object $path) : void
-  - searchRemote(string $guid) : ?object
-  - getRemote(object $path, string $guid) : ?object
-  - loadRemoteFile(string $owner, string $repo, ...) : mixed
+  # searchRemote(string $guid) : ?object
+  # getRemote(object $path, string $guid) : ?object
+  # loadRemoteFile(string $organisation, string $repository, ...) : mixed
 }
 
 note right of Grep::remoteIndex
@@ -34,7 +34,7 @@ note right of Grep::searchRemote
 end note
 
 note right of Grep::getRemote
-  Get a remote power
+  Get a remote joomla power
 
   since: 3.2.0
   return: ?object
@@ -47,8 +47,8 @@ note right of Grep::loadRemoteFile
   return: mixed
   
   arguments:
-    string $owner
-    string $repo
+    string $organisation
+    string $repository
     string $path
     ?string $branch
 end note
diff --git a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.php b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.php
index 653c1d2..2092bdf 100644
--- a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.php
+++ b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.php
@@ -13,10 +13,10 @@ namespace VDM\Joomla\Componentbuilder\JoomlaPower;
 
 
 use Joomla\CMS\Language\Text;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Interfaces\GrepInterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Grep as ExtendingGrep;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Interfaces\GrepInterface;
+use VDM\Joomla\Abstraction\Grep as ExtendingGrep;
 
 
 /**
@@ -54,18 +54,36 @@ final class Grep extends ExtendingGrep implements GrepInterface
 			return;
 		}
 
+		$path->index = null;
+
+		// update the branch
+		$branch_field = $this->getBranchField();
+		$branch = $path->{$branch_field} ?? $path->read_branch ?? 'master';
+
 		try
 		{
-			$path->index = $this->contents->get($path->owner, $path->repo, 'joomla-powers.json', $path->branch);
+			$this->contents->load_($path->base ?? null, $path->token ?? null);
+			$source = $this->contents->metadata($path->organisation, $path->repository, 'src', $branch);
+			if ($source && is_array($source))
+			{
+				$path->index = new \stdClass();
+				foreach ($source as $index)
+				{
+					if (is_object($index) && isset($index->name))
+					{
+						$path->index->{$index->name} = $index;
+					}
+				}
+			}
+
+			$this->contents->reset_();
 		}
 		catch (\Exception $e)
 		{
 			$this->app->enqueueMessage(
-				Text::sprintf('COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BSSB_GAVE_THE_FOLLOWING_ERRORBR_SP', $this->contents->api(), $path->path, $e->getMessage()),
+				Text::sprintf('COM_COMPONENTBUILDER_PJOOMLA_POWERB_REPOSITORY_AT_BSSB_GAVE_THE_FOLLOWING_ERRORBR_SP', $this->contents->api(), $path->path, $e->getMessage()),
 				'Error'
 			);
-
-			$path->index = null;
 		}
 	}
 
@@ -77,10 +95,10 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchRemote(string $guid): ?object
+	protected function searchRemote(string $guid): ?object
 	{
 		// we can only search if we have paths
-		if ($this->path && $this->paths)
+		if (is_array($this->paths))
 		{
 			foreach ($this->paths as $path)
 			{
@@ -98,7 +116,7 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	}
 
 	/**
-	 * Get a remote power
+	 * Get a remote joomla power
 	 *
 	 * @param object    $path    The repository path details
 	 * @param string    $guid    The global unique id of the power
@@ -106,48 +124,65 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getRemote(object $path, string $guid): ?object
+	protected function getRemote(object $path, string $guid): ?object
 	{
-		if (empty($path->index->{$guid}->settings))
+		$power = null;
+		if (empty($path->index->{$guid}->path))
 		{
-			return null;
-		}
-
-		// get the settings
-		if (($power = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->settings, $path->branch)) !== null &&
-			isset($power->guid))
-		{
-			// set the git details in params
-			$power->params = (object) [
-				'git' => [
-					'owner' => $path->owner,
-					'repo' => $path->repo,
-					'branch' => $path->branch
-				]
-			];
-
 			return $power;
 		}
 
-		return null;
+		// get the branch name
+		$branch_field = $this->getBranchField();
+		$branch = $path->{$branch_field} ?? $path->read_branch ?? 'master';
+
+		// get the settings
+		$this->contents->load_($path->base ?? null, $path->token ?? null);
+		if (($power = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->path . '/item.json', $branch)) !== null &&
+			isset($power->guid))
+		{
+			// set the git details in params
+			$path_guid = $path->guid ?? null;
+			if ($path_guid !== null)
+			{
+				if (($meta = $this->contents->metadata($path->organisation, $path->repository, $path->index->{$guid}->path . '/item.json', $branch)) !== null &&
+					isset($meta->sha))
+				{
+					if (isset($power->params) && is_object($power->params) &&
+						isset($power->params->source) && is_array($power->params->source))
+					{
+						$power->params->source[$path_guid] = $meta->sha;
+					}
+					else
+					{
+						$power->params = (object)[
+							'source' => [$path_guid => $meta->sha]
+						];
+					}
+				}
+			}
+		}
+		$this->contents->reset_();
+
+		return $power;
 	}
 
 	/**
 	 * Load the remote file
 	 *
-	 * @param string         $owner    The repository owner
-	 * @param string         $repo     The repository name
-	 * @param string         $path     The repository path to file
-	 * @param string|null    $branch   The repository branch name
+	 * @param string         $organisation   The repository organisation
+	 * @param string         $repository     The repository name
+	 * @param string         $path           The repository path to file
+	 * @param string|null    $branch         The repository branch name
 	 *
 	 * @return mixed
 	 * @since 3.2.0
 	 */
-	private function loadRemoteFile(string $owner, string $repo, string $path, ?string $branch)
+	protected function loadRemoteFile(string $organisation, string $repository, string $path, ?string $branch)
 	{
 		try
 		{
-			$data = $this->contents->get($owner, $repo, $path, $branch);
+			$data = $this->contents->get($organisation, $repository, $path, $branch);
 		}
 		catch (\Exception $e)
 		{
diff --git a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.power b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.power
index be21fe6..75ebb88 100644
--- a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.power
+++ b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/code.power
@@ -21,18 +21,36 @@
 			return;
 		}
 
+		$path->index = null;
+
+		// update the branch
+		$branch_field = $this->getBranchField();
+		$branch = $path->{$branch_field} ?? $path->read_branch ?? 'master';
+
 		try
 		{
-			$path->index = $this->contents->get($path->owner, $path->repo, 'joomla-powers.json', $path->branch);
+			$this->contents->load_($path->base ?? null, $path->token ?? null);
+			$source = $this->contents->metadata($path->organisation, $path->repository, 'src', $branch);
+			if ($source && is_array($source))
+			{
+				$path->index = new \stdClass();
+				foreach ($source as $index)
+				{
+					if (is_object($index) && isset($index->name))
+					{
+						$path->index->{$index->name} = $index;
+					}
+				}
+			}
+
+			$this->contents->reset_();
 		}
 		catch (\Exception $e)
 		{
 			$this->app->enqueueMessage(
-				Text::sprintf('<p>Super Power</b> repository at <b>%s/%s</b> gave the following error!<br />%s</p>', $this->contents->api(), $path->path, $e->getMessage()),
+				Text::sprintf('<p>Joomla Power</b> repository at <b>%s/%s</b> gave the following error!<br />%s</p>', $this->contents->api(), $path->path, $e->getMessage()),
 				'Error'
 			);
-
-			$path->index = null;
 		}
 	}
 
@@ -44,10 +62,10 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchRemote(string $guid): ?object
+	protected function searchRemote(string $guid): ?object
 	{
 		// we can only search if we have paths
-		if ($this->path && $this->paths)
+		if (is_array($this->paths))
 		{
 			foreach ($this->paths as $path)
 			{
@@ -65,7 +83,7 @@
 	}
 
 	/**
-	 * Get a remote power
+	 * Get a remote joomla power
 	 *
 	 * @param object    $path    The repository path details
 	 * @param string    $guid    The global unique id of the power
@@ -73,48 +91,65 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getRemote(object $path, string $guid): ?object
+	protected function getRemote(object $path, string $guid): ?object
 	{
-		if (empty($path->index->{$guid}->settings))
+		$power = null;
+		if (empty($path->index->{$guid}->path))
 		{
-			return null;
-		}
-
-		// get the settings
-		if (($power = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->settings, $path->branch)) !== null &&
-			isset($power->guid))
-		{
-			// set the git details in params
-			$power->params = (object) [
-				'git' => [
-					'owner' => $path->owner,
-					'repo' => $path->repo,
-					'branch' => $path->branch
-				]
-			];
-
 			return $power;
 		}
 
-		return null;
+		// get the branch name
+		$branch_field = $this->getBranchField();
+		$branch = $path->{$branch_field} ?? $path->read_branch ?? 'master';
+
+		// get the settings
+		$this->contents->load_($path->base ?? null, $path->token ?? null);
+		if (($power = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->path . '/item.json', $branch)) !== null &&
+			isset($power->guid))
+		{
+			// set the git details in params
+			$path_guid = $path->guid ?? null;
+			if ($path_guid !== null)
+			{
+				if (($meta = $this->contents->metadata($path->organisation, $path->repository, $path->index->{$guid}->path . '/item.json', $branch)) !== null &&
+					isset($meta->sha))
+				{
+					if (isset($power->params) && is_object($power->params) &&
+						isset($power->params->source) && is_array($power->params->source))
+					{
+						$power->params->source[$path_guid] = $meta->sha;
+					}
+					else
+					{
+						$power->params = (object)[
+							'source' => [$path_guid => $meta->sha]
+						];
+					}
+				}
+			}
+		}
+		$this->contents->reset_();
+
+		return $power;
 	}
 
 	/**
 	 * Load the remote file
 	 *
-	 * @param string         $owner    The repository owner
-	 * @param string         $repo     The repository name
-	 * @param string         $path     The repository path to file
-	 * @param string|null    $branch   The repository branch name
+	 * @param string         $organisation   The repository organisation
+	 * @param string         $repository     The repository name
+	 * @param string         $path           The repository path to file
+	 * @param string|null    $branch         The repository branch name
 	 *
 	 * @return mixed
 	 * @since 3.2.0
 	 */
-	private function loadRemoteFile(string $owner, string $repo, string $path, ?string $branch)
+	protected function loadRemoteFile(string $organisation, string $repository, string $path, ?string $branch)
 	{
 		try
 		{
-			$data = $this->contents->get($owner, $repo, $path, $branch);
+			$data = $this->contents->get($organisation, $repository, $path, $branch);
 		}
 		catch (\Exception $e)
 		{
diff --git a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/settings.json b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/settings.json
index 0571cda..a7c9feb 100644
--- a/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/settings.json
+++ b/src/355bf21a-f859-4528-9110-bcd2c6d05ea7/settings.json
@@ -21,7 +21,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Grep",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Grep",
     "description": "Global Resource Empowerment Platform\r\n\r\n   The Grep feature will try to find your joomla power in the repositories listed in the global\r\n   Options of JCB in the super powers tab, and if it can't be found there will try the global core\r\n   Super powers of JCB. All searches are performed according the the [algorithm:cascading]\r\n   See documentation for more details: https:\/\/git.vdm.dev\/joomla\/super-powers\/wiki\r\n\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Language\\Text;",
diff --git a/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/README.md b/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/README.md
index a9a4b3b..872d79a 100644
--- a/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/README.md
+++ b/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ServiceProvider (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Generator**
+> extends: ****
 ```uml
 @startuml
 class ServiceProvider << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/settings.json b/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/settings.json
index bb8678d..fb3ca37 100644
--- a/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/settings.json
+++ b/src/369ae3f5-90db-43b9-aba9-ce5c83311c4e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "369ae3f5-90db-43b9-aba9-ce5c83311c4e",
     "implements": null,
     "load_selection": null,
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.ServiceProvider",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.ServiceProvider",
     "description": "Power code Generator for the Service Provider of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/README.md b/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/README.md
index a1e4791..bd03232 100644
--- a/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/README.md
+++ b/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/README.md
@@ -8,6 +8,7 @@
 ```
 # class Header (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Header  #Gold {
diff --git a/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/settings.json b/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/settings.json
index 969e8b6..5ad6200 100644
--- a/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/settings.json
+++ b/src/36d49d4a-8d0e-435f-ab4c-8f247d96fd4d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "36d49d4a-8d0e-435f-ab4c-8f247d96fd4d",
     "implements": [
         "-1"
@@ -29,7 +29,8 @@
             "as": "J5Header"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Header",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.Header",
     "description": "Header Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/README.md b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/README.md
index 831058d..0f68370 100644
--- a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/README.md
+++ b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class JoomlaPower (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class JoomlaPower << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/code.php b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/code.php
index 900a969..8ef3d92 100644
--- a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/code.php
+++ b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/code.php
@@ -20,10 +20,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Super as SuperPower;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GuidHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\NamespaceHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\NamespaceHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\PowerInterface;
 
 
diff --git a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/settings.json b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/settings.json
index af417fd..0605ead 100644
--- a/src/3730a000-ab64-477d-8b0f-70eaf71b517a/settings.json
+++ b/src/3730a000-ab64-477d-8b0f-70eaf71b517a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "3730a000-ab64-477d-8b0f-70eaf71b517a",
     "implements": [
         "1133c2d7-ba7e-4c95-8cde-01f084d04682"
@@ -49,7 +49,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaPower",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaPower",
     "description": "Joomla Power\r\n\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;",
diff --git a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/README.md b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/README.md
index 5344ce2..41cb673 100644
--- a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/README.md
+++ b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/README.md
@@ -6,73 +6,14 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Insert (Details)
-> namespace: **VDM\Joomla\Componentbuilder\Power\Database**
+# final class Insert (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Power\Data**
+> extends: **ExtendingInsert**
 ```uml
 @startuml
-class Insert  #Gold {
-  # Model $model
-  # Database $database
+class Insert << (F,LightGreen) >> #RoyalBlue {
   # string $table
-  + __construct(Model $model, Database $database)
-  + value(mixed $value, string $field, ...) : bool
-  + row(array $item) : bool
-  + rows(?array $items) : bool
-  + item(object $item) : bool
-  + items(?array $items) : bool
 }
-
-note right of Insert::__construct
-  Constructor
-
-  since: 3.2.0
-end note
-
-note right of Insert::value
-  Insert a value to a given table
-Example: $this->value(Value, 'value_key', 'GUID');
-
-  since: 3.2.0
-  return: bool
-  
-  arguments:
-    mixed $value
-    string $field
-    string $keyValue
-    string $key = 'guid'
-end note
-
-note right of Insert::row
-  Insert single row with multiple values to a given table
-Example: $this->item(Array);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Insert::rows
-  Insert multiple rows to a given table
-Example: $this->items(Array);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Insert::item
-  Insert single item with multiple values to a given table
-Example: $this->item(Object);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Insert::items
-  Insert multiple items to a given table
-Example: $this->items(Array);
-
-  since: 3.2.0
-  return: bool
-end note
  
 @enduml
 ```
diff --git a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.php b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.php
index e23873a..25f7fc0 100644
--- a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.php
+++ b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.php
@@ -9,160 +9,26 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\Power\Database;
+namespace VDM\Joomla\Componentbuilder\Power\Data;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface as Model;
-use VastDevelopmentMethod\Joomla\Database\Insert as Database;
-use VDM\Joomla\Componentbuilder\Interfaces\Database\InsertInterface;
+use VDM\Joomla\Interfaces\Data\InsertInterface;
+use VDM\Joomla\Abstraction\Data\Insert as ExtendingInsert;
 
 
 /**
- * Power Database Insert
+ * Power Data Insert (GUID)
  * 
- * @since 3.2.0
+ * @since 3.2.2
  */
-class Insert implements InsertInterface
+final class Insert extends ExtendingInsert implements InsertInterface
 {
-	/**
-	 * Model
-	 *
-	 * @var    Model
-	 * @since 3.2.0
-	 */
-	protected Model $model;
-
-	/**
-	 * Database
-	 *
-	 * @var    Database
-	 * @since 3.2.0
-	 */
-	protected Database $database;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Model       $model       The set model object.
-	 * @param Database    $database    The insert database object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Model $model, Database $database)
-	{
-		$this->model = $model;
-		$this->database = $database;
-	}
-
-	/**
-	 * Insert a value to a given table
-	 *          Example: $this->value(Value, 'value_key', 'GUID');
-	 *
-	 * @param   mixed     $value      The field value
-	 * @param   string    $field      The field key
-	 * @param   string    $keyValue   The key value
-	 * @param   string    $key        The key name
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function value($value, string $field, string $keyValue, string $key = 'guid'): bool
-	{
-		// build the array
-		$item = [];
-		$item[$key] = $keyValue;
-		$item[$field] = $value;
-
-		// Insert the column of this table
-		return $this->row($item);
-	}
-
-	/**
-	 * Insert single row with multiple values to a given table
-	 *          Example: $this->item(Array);
-	 *
-	 * @param   array    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function row(array $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->row($item, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->row($item, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert multiple rows to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of arrays)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function rows(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->rows($items, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->rows($items, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert single item with multiple values to a given table
-	 *          Example: $this->item(Object);
-	 *
-	 * @param   object    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function item(object $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->item($item, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->item($item, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert multiple items to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of objects)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function items(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->items($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->items($items, $this->table);
-		}
-		return false;
-	}
+	protected string $table = 'power';
 }
 
diff --git a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.power b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.power
index c7be64c..e2209eb 100644
--- a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.power
+++ b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/code.power
@@ -1,140 +1,7 @@
-	/**
-	 * Model
-	 *
-	 * @var    Model
-	 * @since 3.2.0
-	 */
-	protected Model $model;
-
-	/**
-	 * Database
-	 *
-	 * @var    Database
-	 * @since 3.2.0
-	 */
-	protected Database $database;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Model       $model       The set model object.
-	 * @param Database    $database    The insert database object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Model $model, Database $database)
-	{
-		$this->model = $model;
-		$this->database = $database;
-	}
-
-	/**
-	 * Insert a value to a given table
-	 *          Example: $this->value(Value, 'value_key', 'GUID');
-	 *
-	 * @param   mixed     $value      The field value
-	 * @param   string    $field      The field key
-	 * @param   string    $keyValue   The key value
-	 * @param   string    $key        The key name
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function value($value, string $field, string $keyValue, string $key = 'guid'): bool
-	{
-		// build the array
-		$item = [];
-		$item[$key] = $keyValue;
-		$item[$field] = $value;
-
-		// Insert the column of this table
-		return $this->row($item);
-	}
-
-	/**
-	 * Insert single row with multiple values to a given table
-	 *          Example: $this->item(Array);
-	 *
-	 * @param   array    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function row(array $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->row($item, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->row($item, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert multiple rows to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of arrays)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function rows(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->rows($items, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->rows($items, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert single item with multiple values to a given table
-	 *          Example: $this->item(Object);
-	 *
-	 * @param   object    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function item(object $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->item($item, $this->table)) !== null)
-		{
-			// Insert the column of this table
-			return $this->database->item($item, $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Insert multiple items to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of objects)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function items(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->items($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->items($items, $this->table);
-		}
-		return false;
-	}
\ No newline at end of file
+	protected string $table = 'power';
\ No newline at end of file
diff --git a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/settings.json b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/settings.json
index 7d300ff..2643303 100644
--- a/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/settings.json
+++ b/src/380bb7a3-cdcc-4336-a699-5070cbf521a5/settings.json
@@ -1,28 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "a455d916-cfe4-41df-9245-bafb709aacdb",
     "guid": "380bb7a3-cdcc-4336-a699-5070cbf521a5",
     "implements": [
-        "95c02df3-fe0a-405b-b506-b7a5b8605b66"
+        "03bbc8d5-86e8-4d2f-ae5f-0d44a4f7af13"
     ],
     "load_selection": null,
     "name": "Insert",
     "power_version": "1.0.0",
-    "system_name": "JCB.Power.Database.Insert",
-    "type": "class",
-    "use_selection": {
-        "use_selection0": {
-            "use": "8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff",
-            "as": "Model"
-        },
-        "use_selection1": {
-            "use": "524eb8f6-38d4-47dc-92ad-98b94e099ac0",
-            "as": "Database"
-        }
-    },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Database.Insert",
-    "description": "Power Database Insert\r\n\r\n@since 3.2.0",
+    "system_name": "JCB.Power.Data.Insert",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Data.Insert",
+    "description": "Power Data Insert (GUID)\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/38e1ca3e-1908-459a-be87-9f83b292058f/README.md b/src/38e1ca3e-1908-459a-be87-9f83b292058f/README.md
index 176eecf..8471abf 100644
--- a/src/38e1ca3e-1908-459a-be87-9f83b292058f/README.md
+++ b/src/38e1ca3e-1908-459a-be87-9f83b292058f/README.md
@@ -8,6 +8,7 @@
 ```
 # class JoomlaPower (Details)
 > namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Service**
+> extends: ****
 ```uml
 @startuml
 class JoomlaPower  #Gold {
@@ -16,48 +17,56 @@ class JoomlaPower  #Gold {
   + getTable(Container $container) : Table
   + getGrep(Container $container) : Grep
   + getSuperpower(Container $container) : Superpower
+  + getRepository(Container $container) : Repository
   + getParser(Container $container) : Parser
 }
 
 note right of JoomlaPower::register
   Registers the service provider with a DI container.
 
-  since: 3.2.0
+  since: 3.2.1
   return: void
 end note
 
 note right of JoomlaPower::getConfig
   Get The Config Class.
 
-  since: 3.2.0
+  since: 3.2.1
   return: Config
 end note
 
 note right of JoomlaPower::getTable
   Get The Table Class.
 
-  since: 3.2.0
+  since: 3.2.1
   return: Table
 end note
 
 note right of JoomlaPower::getGrep
   Get The Grep Class.
 
-  since: 3.2.0
+  since: 3.2.1
   return: Grep
 end note
 
 note right of JoomlaPower::getSuperpower
   Get The Super Class.
 
-  since: 3.2.0
+  since: 3.2.1
   return: Superpower
 end note
 
+note right of JoomlaPower::getRepository
+  Get The Repository Class.
+
+  since: 3.2.2
+  return: Repository
+end note
+
 note right of JoomlaPower::getParser
   Get The Parser Class.
 
-  since: 3.2.0
+  since: 3.2.1
   return: Parser
 end note
  
diff --git a/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.php b/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.php
index 4a843d7..5607931 100644
--- a/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.php
+++ b/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.php
@@ -15,9 +15,10 @@ namespace VDM\Joomla\Componentbuilder\JoomlaPower\Service;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Config;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Table;
+use VDM\Joomla\Componentbuilder\Table;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Grep;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Super as Superpower;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Repository;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Parser;
 
 
@@ -34,7 +35,7 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  void
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function register(Container $container)
 	{
@@ -50,6 +51,9 @@ class JoomlaPower implements ServiceProviderInterface
 		$container->alias(Superpower::class, 'Joomlapower')
 			->share('Joomlapower', [$this, 'getSuperpower'], true);
 
+		$container->alias(Repository::class, 'Joomla.Power.Repository')
+			->share('Joomla.Power.Repository', [$this, 'getRepository'], true);
+
 		$container->alias(Parser::class, 'Power.Parser')
 			->share('Power.Parser', [$this, 'getParser'], true);
 	}
@@ -60,7 +64,7 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Config
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getConfig(Container $container): Config
 	{
@@ -73,7 +77,7 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Table
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getTable(Container $container): Table
 	{
@@ -86,14 +90,13 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Grep
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_joomla_powers_repository_path,
-			$container->get('Config')->approved_joomla_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Gitea.Repository.Contents'),
+			$container->get('Config')->approved_joomla_paths
 		);
 	}
 
@@ -103,14 +106,31 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Superpower
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getSuperpower(Container $container): Superpower
 	{
 		return new Superpower(
 			$container->get('Joomla.Power.Grep'),
-			$container->get('Joomla.Power.Database.Insert'),
-			$container->get('Joomla.Power.Database.Update')
+			$container->get('Data.Item')
+		);
+	}
+
+	/**
+	 * Get The Repository Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Repository
+	 * @since 3.2.2
+	 */
+	public function getRepository(Container $container): Repository
+	{
+		return new Repository(
+			$container->get('Config')->approved_joomla_paths,
+			$container->get('Joomla.Power.Grep'),
+			$container->get('Data.Items'),
+			$container->get('Gitea.Repository.Contents')
 		);
 	}
 
@@ -120,7 +140,7 @@ class JoomlaPower implements ServiceProviderInterface
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Parser
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getParser(Container $container): Parser
 	{
diff --git a/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.power b/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.power
index 165f7c7..436ccba 100644
--- a/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.power
+++ b/src/38e1ca3e-1908-459a-be87-9f83b292058f/code.power
@@ -4,7 +4,7 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  void
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function register(Container $container)
 	{
@@ -20,6 +20,9 @@
 		$container->alias(Superpower::class, 'Joomlapower')
 			->share('Joomlapower', [$this, 'getSuperpower'], true);
 
+		$container->alias(Repository::class, 'Joomla.Power.Repository')
+			->share('Joomla.Power.Repository', [$this, 'getRepository'], true);
+
 		$container->alias(Parser::class, 'Power.Parser')
 			->share('Power.Parser', [$this, 'getParser'], true);
 	}
@@ -30,7 +33,7 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Config
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getConfig(Container $container): Config
 	{
@@ -43,7 +46,7 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Table
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getTable(Container $container): Table
 	{
@@ -56,14 +59,13 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Grep
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_joomla_powers_repository_path,
-			$container->get('Config')->approved_joomla_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Gitea.Repository.Contents'),
+			$container->get('Config')->approved_joomla_paths
 		);
 	}
 
@@ -73,14 +75,31 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Superpower
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getSuperpower(Container $container): Superpower
 	{
 		return new Superpower(
 			$container->get('Joomla.Power.Grep'),
-			$container->get('Joomla.Power.Database.Insert'),
-			$container->get('Joomla.Power.Database.Update')
+			$container->get('Data.Item')
+		);
+	}
+
+	/**
+	 * Get The Repository Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Repository
+	 * @since 3.2.2
+	 */
+	public function getRepository(Container $container): Repository
+	{
+		return new Repository(
+			$container->get('Config')->approved_joomla_paths,
+			$container->get('Joomla.Power.Grep'),
+			$container->get('Data.Items'),
+			$container->get('Gitea.Repository.Contents')
 		);
 	}
 
@@ -90,7 +109,7 @@
 	 * @param   Container  $container  The DI container.
 	 *
 	 * @return  Parser
-	 * @since 3.2.0
+	 * @since 3.2.1
 	 */
 	public function getParser(Container $container): Parser
 	{
diff --git a/src/38e1ca3e-1908-459a-be87-9f83b292058f/settings.json b/src/38e1ca3e-1908-459a-be87-9f83b292058f/settings.json
index 45181a9..eb50e13 100644
--- a/src/38e1ca3e-1908-459a-be87-9f83b292058f/settings.json
+++ b/src/38e1ca3e-1908-459a-be87-9f83b292058f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "38e1ca3e-1908-459a-be87-9f83b292058f",
     "implements": [
         "-1"
@@ -29,11 +29,16 @@
             "as": "Superpower"
         },
         "use_selection4": {
+            "use": "85cddb24-7ee6-4d86-a0db-615f443e1aec",
+            "as": "default"
+        },
+        "use_selection5": {
             "use": "95d0e03f-24fd-4412-bc2e-f0899fcc3205",
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Service.JoomlaPower",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Service.JoomlaPower",
     "description": "Joomla Power Service Provider\r\n\r\n@since 3.2.1",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/README.md b/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/README.md
index af5fd62..5406055 100644
--- a/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/README.md
+++ b/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AccessSectionsJoomlaFields (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class AccessSectionsJoomlaFields << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/settings.json b/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/settings.json
index 595785f..d07103a 100644
--- a/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/settings.json
+++ b/src/396f9883-4e50-4b65-a1d5-05bd6c23df30/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "396f9883-4e50-4b65-a1d5-05bd6c23df30",
     "implements": null,
     "load_selection": null,
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.AccessSectionsJoomlaFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.AccessSectionsJoomlaFields",
     "description": "Access Sections Joomla Fields Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/README.md b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/README.md
index 8c3f39e..00a06ba 100644
--- a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/README.md
+++ b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/README.md
@@ -8,7 +8,7 @@
 ```
 # final class Super (Details)
 > namespace: **VDM\Joomla\Componentbuilder\JoomlaPower**
-> extends: **ExtendingSuper**
+> extends: **Remote**
 ```uml
 @startuml
 class Super << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/code.php b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/code.php
index 1a56848..5ea95f2 100644
--- a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/code.php
+++ b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\JoomlaPower;
 
 
-use VDM\Joomla\Componentbuilder\Interfaces\SuperInterface;
-use VDM\Joomla\Componentbuilder\Power\Super as ExtendingSuper;
+use VDM\Joomla\Interfaces\Data\RemoteInterface;
+use VDM\Joomla\Data\Remote;
 
 
 /**
@@ -21,7 +21,7 @@ use VDM\Joomla\Componentbuilder\Power\Super as ExtendingSuper;
  * 
  * @since 3.2.0
  */
-final class Super extends ExtendingSuper implements SuperInterface
+final class Super extends Remote implements RemoteInterface
 {
 	/**
 	 * Table Name
diff --git a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/settings.json b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/settings.json
index 0a2b316..b639da4 100644
--- a/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/settings.json
+++ b/src/39a75870-a7f7-45fd-937d-5ba97b85b8ad/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "3ab0eba9-f37b-4b37-aec1-2e78067f2aff",
+    "extends": "728ee726-3f0f-4762-899d-f8c9430cee58",
     "guid": "39a75870-a7f7-45fd-937d-5ba97b85b8ad",
     "implements": [
         "51de80f2-2868-4c2c-8198-ef79349e9bd7"
@@ -12,7 +12,8 @@
     "system_name": "JCB.JoomlaPower.Super",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Super",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Super",
     "description": "Super Joomla Power of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/README.md b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/README.md
index 5ec11a1..528764f 100644
--- a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/README.md
+++ b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Templatelayout**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/code.php b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/code.php
index 2408fa9..a38a8b2 100644
--- a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/code.php
+++ b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/code.php
@@ -16,8 +16,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\LayoutData;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\TemplateData;
 use VDM\Joomla\Componentbuilder\Compiler\Alias\Data as Aliasdata;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/settings.json b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/settings.json
index 5535cc8..ba17aea 100644
--- a/src/39ea8150-f124-4e47-909d-641bf1c96d5e/settings.json
+++ b/src/39ea8150-f124-4e47-909d-641bf1c96d5e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "39ea8150-f124-4e47-909d-641bf1c96d5e",
     "implements": null,
     "load_selection": null,
@@ -35,6 +35,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Templatelayout.Data",
     "description": "Template Layout Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/3a777d70-52ad-49ec-9016-6f7438608613/README.md b/src/3a777d70-52ad-49ec-9016-6f7438608613/README.md
index df29108..dd58f22 100644
--- a/src/3a777d70-52ad-49ec-9016-6f7438608613/README.md
+++ b/src/3a777d70-52ad-49ec-9016-6f7438608613/README.md
@@ -8,6 +8,7 @@
 ```
 # interface HeaderInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface HeaderInterface  #Lavender {
diff --git a/src/3a777d70-52ad-49ec-9016-6f7438608613/settings.json b/src/3a777d70-52ad-49ec-9016-6f7438608613/settings.json
index 7b127e9..08456c6 100644
--- a/src/3a777d70-52ad-49ec-9016-6f7438608613/settings.json
+++ b/src/3a777d70-52ad-49ec-9016-6f7438608613/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "3a777d70-52ad-49ec-9016-6f7438608613",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.HeaderInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.HeaderInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.HeaderInterface",
     "description": "Compiler Header Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/README.md b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/README.md
index cd07215..0112e1c 100644
--- a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/README.md
+++ b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/README.md
@@ -6,81 +6,14 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Super (Details)
+# final class Super (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power**
+> extends: **Remote**
 ```uml
 @startuml
-class Super  #Gold {
-  # Grep $grep
-  # Insert $insert
-  # Update $update
+class Super << (F,LightGreen) >> #RoyalBlue {
   # string $table
-  + __construct(Grep $grep, Insert $insert, ...)
-  + init() : bool
-  + reset(array $powers) : bool
-  + load(string $guid, array $order = ['remote', 'local'], ...) : bool
-  - insert(object $power) : bool
-  - update(object $power) : bool
-  - action(string $guid) : string
 }
-
-note right of Super::__construct
-  Constructor.
-
-  since: 3.2.0
-  
-  arguments:
-    Grep $grep
-    Insert $insert
-    Update $update
-end note
-
-note right of Super::init
-  Init all power not found in database
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Super::reset
-  Reset the powers
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Super::load
-  Load a superpower
-
-  since: 3.2.0
-  return: bool
-  
-  arguments:
-    string $guid
-    array $order = ['remote', 'local']
-    ?string $action = null
-end note
-
-note right of Super::insert
-  Insert a superpower
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Super::update
-  Update a superpower
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Super::action
-  Get loading action
-
-  since: 3.2.0
-  return: string
-end note
  
 @enduml
 ```
diff --git a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php
index 481451c..eef7f0e 100644
--- a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php
+++ b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.php
@@ -12,11 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Power;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\GrepInterface as Grep;
-use VDM\Joomla\Componentbuilder\Interfaces\Database\InsertInterface as Insert;
-use VDM\Joomla\Componentbuilder\Interfaces\Database\UpdateInterface as Update;
-use VastDevelopmentMethod\Joomla\Utilities\GuidHelper;
-use VDM\Joomla\Componentbuilder\Interfaces\SuperInterface;
+use VDM\Joomla\Interfaces\Data\RemoteInterface;
+use VDM\Joomla\Data\Remote;
 
 
 /**
@@ -24,171 +21,14 @@ use VDM\Joomla\Componentbuilder\Interfaces\SuperInterface;
  * 
  * @since 3.2.0
  */
-class Super implements SuperInterface
+final class Super extends Remote implements RemoteInterface
 {
-	/**
-	 * The Power Search Tool
-	 *
-	 * @var    Grep
-	 * @since 3.2.0
-	 **/
-	protected Grep $grep;
-
-	/**
-	 * Insert Data Class
-	 *
-	 * @var    Insert
-	 * @since 3.2.0
-	 **/
-	protected Insert $insert;
-
-	/**
-	 * Update Data Class
-	 *
-	 * @var    Update
-	 * @since 3.2.0
-	 **/
-	protected Update $update;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Grep      $grep     The Power Grep object.
-	 * @param Insert    $insert   The Power Database Insert object.
-	 * @param Update    $update   The Power Database Update object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Grep $grep, Insert $insert, Update $update)
-	{
-		$this->grep = $grep;
-		$this->insert = $insert;
-		$this->update = $update;
-	}
-
-	/**
-	 * Init all power not found in database
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function init(): bool
-	{
-		if (($powers = $this->grep->getRemotePowersGuid()) !== null)
-		{
-			foreach($powers as $guid)
-			{
-				if ($this->action($guid) === 'insert' && ($power = $this->grep->get($guid, ['remote'])) !== null)
-				{
-					$this->insert($power);
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Reset the powers
-	 *
-	 * @param array   $powers    The global unique ids of the powers
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function reset(array $powers): bool
-	{
-		if ($powers === [])
-		{
-			return false;
-		}
-
-		$success = true;
-
-		foreach($powers as $guid)
-		{
-			if (!$this->load($guid, ['remote']))
-			{
-				$success = false;
-			}
-		}
-
-		return $success;
-	}
-
-	/**
-	 * Load a superpower
-	 *
-	 * @param string   $guid    The global unique id of the power
-	 * @param array    $order   The search order
-	 * @param string|null   $action  The action to load power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function load(string $guid, array $order = ['remote', 'local'], ?string $action = null): bool
-	{
-		if (($power = $this->grep->get($guid, $order)) !== null &&
-			($action !== null || ($action = $this->action($power->guid)) !== null))
-		{
-			return method_exists($this, $action) ? $this->{$action}($power) : false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Insert a superpower
-	 *
-	 * @param object   $power    The power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	private function insert(object $power): bool
-	{
-		return $this->insert->item($power);
-	}
-
-	/**
-	 * Update a superpower
-	 *
-	 * @param object   $power    The power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	private function update(object $power): bool
-	{
-		return $this->update->item($power);
-	}
-
-	/**
-	 * Get loading action
-	 *
-	 * @param string   $guid   The global unique id of the power
-	 *
-	 * @return string
-	 * @since 3.2.0
-	 */
-	private function action(string $guid): string
-	{
-		if (($id = GuidHelper::item($guid, $this->table)) !== null && $id > 0)
-		{
-			return 'update';
-		}
-
-		return 'insert';
-	}
+	protected string $table = 'power';
 }
 
diff --git a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.power b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.power
index 0f31917..e2209eb 100644
--- a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.power
+++ b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/code.power
@@ -1,164 +1,7 @@
-	/**
-	 * The Power Search Tool
-	 *
-	 * @var    Grep
-	 * @since 3.2.0
-	 **/
-	protected Grep $grep;
-
-	/**
-	 * Insert Data Class
-	 *
-	 * @var    Insert
-	 * @since 3.2.0
-	 **/
-	protected Insert $insert;
-
-	/**
-	 * Update Data Class
-	 *
-	 * @var    Update
-	 * @since 3.2.0
-	 **/
-	protected Update $update;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Grep      $grep     The Power Grep object.
-	 * @param Insert    $insert   The Power Database Insert object.
-	 * @param Update    $update   The Power Database Update object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Grep $grep, Insert $insert, Update $update)
-	{
-		$this->grep = $grep;
-		$this->insert = $insert;
-		$this->update = $update;
-	}
-
-	/**
-	 * Init all power not found in database
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function init(): bool
-	{
-		if (($powers = $this->grep->getRemotePowersGuid()) !== null)
-		{
-			foreach($powers as $guid)
-			{
-				if ($this->action($guid) === 'insert' && ($power = $this->grep->get($guid, ['remote'])) !== null)
-				{
-					$this->insert($power);
-				}
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Reset the powers
-	 *
-	 * @param array   $powers    The global unique ids of the powers
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function reset(array $powers): bool
-	{
-		if ($powers === [])
-		{
-			return false;
-		}
-
-		$success = true;
-
-		foreach($powers as $guid)
-		{
-			if (!$this->load($guid, ['remote']))
-			{
-				$success = false;
-			}
-		}
-
-		return $success;
-	}
-
-	/**
-	 * Load a superpower
-	 *
-	 * @param string   $guid    The global unique id of the power
-	 * @param array    $order   The search order
-	 * @param string|null   $action  The action to load power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	public function load(string $guid, array $order = ['remote', 'local'], ?string $action = null): bool
-	{
-		if (($power = $this->grep->get($guid, $order)) !== null &&
-			($action !== null || ($action = $this->action($power->guid)) !== null))
-		{
-			return method_exists($this, $action) ? $this->{$action}($power) : false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Insert a superpower
-	 *
-	 * @param object   $power    The power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	private function insert(object $power): bool
-	{
-		return $this->insert->item($power);
-	}
-
-	/**
-	 * Update a superpower
-	 *
-	 * @param object   $power    The power
-	 *
-	 * @return bool
-	 * @since 3.2.0
-	 */
-	private function update(object $power): bool
-	{
-		return $this->update->item($power);
-	}
-
-	/**
-	 * Get loading action
-	 *
-	 * @param string   $guid   The global unique id of the power
-	 *
-	 * @return string
-	 * @since 3.2.0
-	 */
-	private function action(string $guid): string
-	{
-		if (($id = GuidHelper::item($guid, $this->table)) !== null && $id > 0)
-		{
-			return 'update';
-		}
-
-		return 'insert';
-	}
\ No newline at end of file
+	protected string $table = 'power';
\ No newline at end of file
diff --git a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json
index 6bb901c..ad78158 100644
--- a/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json
+++ b/src/3ab0eba9-f37b-4b37-aec1-2e78067f2aff/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "728ee726-3f0f-4762-899d-f8c9430cee58",
     "guid": "3ab0eba9-f37b-4b37-aec1-2e78067f2aff",
     "implements": [
         "51de80f2-2868-4c2c-8198-ef79349e9bd7"
@@ -10,26 +10,10 @@
     "name": "Super",
     "power_version": "1.0.0",
     "system_name": "JCB.Power.Super",
-    "type": "class",
-    "use_selection": {
-        "use_selection0": {
-            "use": "c182506a-ab84-439c-b962-1e606b58d545",
-            "as": "Grep"
-        },
-        "use_selection1": {
-            "use": "95c02df3-fe0a-405b-b506-b7a5b8605b66",
-            "as": "Insert"
-        },
-        "use_selection2": {
-            "use": "69c29be3-ab25-4f56-944e-7ada6307b10c",
-            "as": "Update"
-        },
-        "use_selection3": {
-            "use": "9c513baf-b279-43fd-ae29-a585c8cbc4f0",
-            "as": "default"
-        }
-    },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Super",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Super",
     "description": "Superpower of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/README.md b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/README.md
index fb6e9b8..8ff1d22 100644
--- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/README.md
+++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customview**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php
index d83ffdd..ad4465b 100644
--- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php
+++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.php
@@ -28,9 +28,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Model\Phpcustomview;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Ajaxcustomview;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Custombuttons;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Unique;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
@@ -244,7 +244,7 @@ class Data
 			);
 
 			// Make sure the icon is only an icon path
-			if (strpos($item->icon, '#') !== false)
+			if (isset($item->icon) && strpos($item->icon, '#') !== false)
 			{
 				$item->icon = strstr($item->icon, '#', true);
 			}
diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power
index 28c8221..3c4413e 100644
--- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power
+++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/code.power
@@ -202,7 +202,7 @@
 			);
 
 			// Make sure the icon is only an icon path
-			if (strpos($item->icon, '#') !== false)
+			if (isset($item->icon) && strpos($item->icon, '#') !== false)
 			{
 				$item->icon = strstr($item->icon, '#', true);
 			}
diff --git a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/settings.json b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/settings.json
index 7dbbaeb..49231fb 100644
--- a/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/settings.json
+++ b/src/3b6895da-d9eb-4164-90b1-4632a4cc2474/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "3b6895da-d9eb-4164-90b1-4632a4cc2474",
     "implements": null,
     "load_selection": null,
@@ -83,7 +83,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customview.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customview.Data",
     "description": "Admin Custom View Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/code.php b/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/code.php
index f92d302..fdb9fdc 100644
--- a/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/code.php
+++ b/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/settings.json b/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/settings.json
index 0b00ab1..ca29a00 100644
--- a/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/settings.json
+++ b/src/3f83fe11-1ef6-4020-bd73-f3bb58cefe3a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherOrder",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherOrder",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherOrder",
     "description": "Other Order Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/402239e6-ceec-4ee0-af62-22d462417bf6/README.md b/src/402239e6-ceec-4ee0-af62-22d462417bf6/README.md
index cf83951..a8dd339 100644
--- a/src/402239e6-ceec-4ee0-af62-22d462417bf6/README.md
+++ b/src/402239e6-ceec-4ee0-af62-22d462417bf6/README.md
@@ -8,6 +8,7 @@
 ```
 # class Router (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Router  #Gold {
diff --git a/src/402239e6-ceec-4ee0-af62-22d462417bf6/code.php b/src/402239e6-ceec-4ee0-af62-22d462417bf6/code.php
index 7b00b09..b791bfc 100644
--- a/src/402239e6-ceec-4ee0-af62-22d462417bf6/code.php
+++ b/src/402239e6-ceec-4ee0-af62-22d462417bf6/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Router as Builder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 
 /**
diff --git a/src/402239e6-ceec-4ee0-af62-22d462417bf6/settings.json b/src/402239e6-ceec-4ee0-af62-22d462417bf6/settings.json
index 05e76d2..a3e218e 100644
--- a/src/402239e6-ceec-4ee0-af62-22d462417bf6/settings.json
+++ b/src/402239e6-ceec-4ee0-af62-22d462417bf6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "402239e6-ceec-4ee0-af62-22d462417bf6",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Router",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Router",
     "description": "Model Component Site Router Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/425b1107-933d-4436-87ac-63540ec101c5/README.md b/src/425b1107-933d-4436-87ac-63540ec101c5/README.md
index 8f5094b..18c2443 100644
--- a/src/425b1107-933d-4436-87ac-63540ec101c5/README.md
+++ b/src/425b1107-933d-4436-87ac-63540ec101c5/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowAdd (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFour\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowAdd << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/425b1107-933d-4436-87ac-63540ec101c5/settings.json b/src/425b1107-933d-4436-87ac-63540ec101c5/settings.json
index a6d1d32..a582e79 100644
--- a/src/425b1107-933d-4436-87ac-63540ec101c5/settings.json
+++ b/src/425b1107-933d-4436-87ac-63540ec101c5/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "425b1107-933d-4436-87ac-63540ec101c5",
     "implements": [
         "c9700450-4f44-4455-bc86-6a7660daadee"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Controller.AllowAdd",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Controller.AllowAdd",
     "description": "Controller Allow Add Class for Joomla 4\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/README.md b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/README.md
index 8a7cde3..1a8e0c5 100644
--- a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/README.md
+++ b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Customtabs (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class Customtabs << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/code.php b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/code.php
index ed37c8b..efa0e74 100644
--- a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/code.php
+++ b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/code.php
@@ -17,9 +17,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\CustomTabs as BuilderCustomTabs
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Model\CustomtabsInterface;
 
diff --git a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/settings.json b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/settings.json
index 5c58524..e5a6d36 100644
--- a/src/42648fb4-dfdc-4986-a180-69e5726a25c4/settings.json
+++ b/src/42648fb4-dfdc-4986-a180-69e5726a25c4/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "42648fb4-dfdc-4986-a180-69e5726a25c4",
     "implements": [
         "fcf42c53-0967-4c87-9699-a4d86adfdadf"
@@ -49,7 +49,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.JoomlaFour.Customtabs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.JoomlaFour.Customtabs",
     "description": "Model Custom Tabs Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/README.md b/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/README.md
index 26d91a5..49e26ff 100644
--- a/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/README.md
+++ b/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/README.md
@@ -8,6 +8,7 @@
 ```
 # interface HistoryInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface HistoryInterface  #Lavender {
diff --git a/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/settings.json b/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/settings.json
index a69fcf4..ce1404e 100644
--- a/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/settings.json
+++ b/src/4325745f-da1f-4d4d-a591-3189fe8c06e5/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4325745f-da1f-4d4d-a591-3189fe8c06e5",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.HistoryInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.HistoryInterface",
     "description": "Compiler History Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/README.md b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/README.md
index c8136e6..24d9736 100644
--- a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/README.md
+++ b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreRule (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class CoreRule << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/code.php b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/code.php
index 8cd3acf..0da51e4 100644
--- a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/code.php
+++ b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface;
 
 
diff --git a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/settings.json b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/settings.json
index 6524362..de5db24 100644
--- a/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/settings.json
+++ b/src/43f46bb2-ab6d-47c7-9fd9-f1745a3576fb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "43f46bb2-ab6d-47c7-9fd9-f1745a3576fb",
     "implements": [
         "b9f05dc4-d23a-499a-a826-9749b81818ed"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.CoreRule",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.CoreRule",
     "description": "Core Joomla Field Rules\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/44d039b9-d293-481b-b560-23a6e7a63962/README.md b/src/44d039b9-d293-481b-b560-23a6e7a63962/README.md
index 9526bb0..28a6614 100644
--- a/src/44d039b9-d293-481b-b560-23a6e7a63962/README.md
+++ b/src/44d039b9-d293-481b-b560-23a6e7a63962/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldString (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldString << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/44d039b9-d293-481b-b560-23a6e7a63962/code.php b/src/44d039b9-d293-481b-b560-23a6e7a63962/code.php
index 4670d79..d31ff4b 100644
--- a/src/44d039b9-d293-481b-b560-23a6e7a63962/code.php
+++ b/src/44d039b9-d293-481b-b560-23a6e7a63962/code.php
@@ -21,10 +21,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\CustomFieldTypeFile;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldtypeinterface;
diff --git a/src/44d039b9-d293-481b-b560-23a6e7a63962/settings.json b/src/44d039b9-d293-481b-b560-23a6e7a63962/settings.json
index fc8f612..8016662 100644
--- a/src/44d039b9-d293-481b-b560-23a6e7a63962/settings.json
+++ b/src/44d039b9-d293-481b-b560-23a6e7a63962/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "44d039b9-d293-481b-b560-23a6e7a63962",
     "implements": [
         "2d27c436-4d8e-4692-8382-d9e97af2231c"
@@ -73,7 +73,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldString",
     "description": "Field String Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/44efa649-736d-4656-a0ec-e4f1653a6742/code.php b/src/44efa649-736d-4656-a0ec-e4f1653a6742/code.php
index 9c5e65b..5197ada 100644
--- a/src/44efa649-736d-4656-a0ec-e4f1653a6742/code.php
+++ b/src/44efa649-736d-4656-a0ec-e4f1653a6742/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/44efa649-736d-4656-a0ec-e4f1653a6742/settings.json b/src/44efa649-736d-4656-a0ec-e4f1653a6742/settings.json
index 4e6a47b..f9b7c5b 100644
--- a/src/44efa649-736d-4656-a0ec-e4f1653a6742/settings.json
+++ b/src/44efa649-736d-4656-a0ec-e4f1653a6742/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.LanguageMessages",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.LanguageMessages",
     "description": "Language Messages Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/45652787-9085-4c67-914f-0da25ae62646/code.php b/src/45652787-9085-4c67-914f-0da25ae62646/code.php
index 5d71859..7f1886a 100644
--- a/src/45652787-9085-4c67-914f-0da25ae62646/code.php
+++ b/src/45652787-9085-4c67-914f-0da25ae62646/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/45652787-9085-4c67-914f-0da25ae62646/settings.json b/src/45652787-9085-4c67-914f-0da25ae62646/settings.json
index f0b539c..3757964 100644
--- a/src/45652787-9085-4c67-914f-0da25ae62646/settings.json
+++ b/src/45652787-9085-4c67-914f-0da25ae62646/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.JsonItem",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.JsonItem",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.JsonItem",
     "description": "Json Item Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/46b02edb-427e-4c26-a5cb-279828eb4433/code.php b/src/46b02edb-427e-4c26-a5cb-279828eb4433/code.php
index a7e187e..e07fba0 100644
--- a/src/46b02edb-427e-4c26-a5cb-279828eb4433/code.php
+++ b/src/46b02edb-427e-4c26-a5cb-279828eb4433/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/46b02edb-427e-4c26-a5cb-279828eb4433/settings.json b/src/46b02edb-427e-4c26-a5cb-279828eb4433/settings.json
index 8826962..9a45c65 100644
--- a/src/46b02edb-427e-4c26-a5cb-279828eb4433/settings.json
+++ b/src/46b02edb-427e-4c26-a5cb-279828eb4433/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherJoin",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherJoin",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherJoin",
     "description": "Other Join Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/README.md b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/README.md
index 7cb43e9..92999e5 100644
--- a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/README.md
+++ b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Event (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class Event << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/code.php b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/code.php
index 4172815..578f5f6 100644
--- a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/code.php
+++ b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFour;
 use Joomla\CMS\Factory;
 use Joomla\Registry\Registry;
 use Joomla\CMS\Plugin\PluginHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface;
 
 
diff --git a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/settings.json b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/settings.json
index d994fba..0e09607 100644
--- a/src/4729c2b0-f12b-4397-8d77-055d38bca98b/settings.json
+++ b/src/4729c2b0-f12b-4397-8d77-055d38bca98b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4729c2b0-f12b-4397-8d77-055d38bca98b",
     "implements": [
         "20ed72b0-fcac-4344-aee1-8a65e3bf221d"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFour.Event",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFour.Event",
     "description": "Compiler Events\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\Registry\\Registry;\r\nuse Joomla\\CMS\\Plugin\\PluginHelper;",
diff --git a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/README.md b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/README.md
index 1649b23..ffd5089 100644
--- a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/README.md
+++ b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldDynamic (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldDynamic << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/code.php b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/code.php
index 1dffdc4..5e18e05 100644
--- a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/code.php
+++ b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/code.php
@@ -20,8 +20,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\FieldNames;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldtypeinterface as Field;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Builders;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Layout;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fielddynamicinterface;
 
 
diff --git a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/settings.json b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/settings.json
index 1d087bc..86dc4b7 100644
--- a/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/settings.json
+++ b/src/4801f8b0-4a4a-4eda-8f0e-cf77f042c35e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4801f8b0-4a4a-4eda-8f0e-cf77f042c35e",
     "implements": [
         "c902743e-8c6e-4a50-a4a3-8c955ef2960f"
@@ -53,7 +53,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldDynamic",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldDynamic",
     "description": "Dynamic Field Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/code.php b/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/code.php
index 1e0f4f2..f4197e1 100644
--- a/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/code.php
+++ b/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/settings.json b/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/settings.json
index 618ded1..0174a06 100644
--- a/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/settings.json
+++ b/src/480d11b9-783b-45d5-bce1-b0c2fcaad08a/settings.json
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionViews",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionViews",
     "description": "Permission Views Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/README.md b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/README.md
index 27e361d..c565791 100644
--- a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/README.md
+++ b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/README.md
@@ -8,6 +8,7 @@
 ```
 # class Phpcustomview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Phpcustomview  #Gold {
diff --git a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/code.php b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/code.php
index e21cac0..1c06d5b 100644
--- a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/code.php
+++ b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/code.php
@@ -17,7 +17,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Loader;
 use VDM\Joomla\Componentbuilder\Compiler\Templatelayout\Data as Templatelayout;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/settings.json b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/settings.json
index db4f4e5..26b6f4d 100644
--- a/src/489da602-27c7-418c-bf59-1d45ad42bdcc/settings.json
+++ b/src/489da602-27c7-418c-bf59-1d45ad42bdcc/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "489da602-27c7-418c-bf59-1d45ad42bdcc",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Phpcustomview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Phpcustomview",
     "description": "Model PHP Custom View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/README.md b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/README.md
new file mode 100644
index 0000000..0cfbdf4
--- /dev/null
+++ b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/README.md
@@ -0,0 +1,31 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# final class Delete (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Power\Data**
+> extends: **ExtendingDelete**
+```uml
+@startuml
+class Delete << (F,LightGreen) >> #RoyalBlue {
+  # string $table
+}
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.php b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.php
new file mode 100644
index 0000000..f039659
--- /dev/null
+++ b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Power\Data;
+
+
+use VDM\Joomla\Interfaces\Data\DeleteInterface;
+use VDM\Joomla\Abstraction\Data\Delete as ExtendingDelete;
+
+
+/**
+ * Power Data Delete
+ * 
+ * @since 3.2.2
+ */
+final class Delete extends ExtendingDelete implements DeleteInterface
+{
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.2
+	 */
+	protected string $table = 'power';
+}
+
diff --git a/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.power b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.power
new file mode 100644
index 0000000..ca6c533
--- /dev/null
+++ b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/code.power
@@ -0,0 +1,7 @@
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.2
+	 */
+	protected string $table = 'power';
\ No newline at end of file
diff --git a/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/settings.json b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/settings.json
new file mode 100644
index 0000000..0eb6065
--- /dev/null
+++ b/src/4a4974f4-ac33-4d0f-9cc1-deb21b36d997/settings.json
@@ -0,0 +1,21 @@
+{
+    "add_head": "0",
+    "add_licensing_template": "2",
+    "extends": "3fc72954-a303-4cac-b53c-554be38b85e7",
+    "guid": "4a4974f4-ac33-4d0f-9cc1-deb21b36d997",
+    "implements": [
+        "d8f9ba53-c490-4e8b-8e9f-6757224e069c"
+    ],
+    "load_selection": null,
+    "name": "Delete",
+    "power_version": "1.0.0",
+    "system_name": "JCB.Power.Data.Delete",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Data.Delete",
+    "description": "Power Data Delete\r\n\r\n@since 3.2.2",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/code.php b/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/code.php
index 8c228e9..c9bc4ef 100644
--- a/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/code.php
+++ b/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/settings.json b/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/settings.json
index c469788..d94f757 100644
--- a/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/settings.json
+++ b/src/4a4cf7a3-d0f9-439e-96fb-82d7a4ae0cf5/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Router",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Router",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Router",
     "description": "Database Uninstall Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4a857023-2d96-4649-9ed5-910d0329854d/code.php b/src/4a857023-2d96-4649-9ed5-910d0329854d/code.php
index bc7d224..99a2c25 100644
--- a/src/4a857023-2d96-4649-9ed5-910d0329854d/code.php
+++ b/src/4a857023-2d96-4649-9ed5-910d0329854d/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/4a857023-2d96-4649-9ed5-910d0329854d/settings.json b/src/4a857023-2d96-4649-9ed5-910d0329854d/settings.json
index e9d1986..a5bbd41 100644
--- a/src/4a857023-2d96-4649-9ed5-910d0329854d/settings.json
+++ b/src/4a857023-2d96-4649-9ed5-910d0329854d/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Lists",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Lists",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Lists",
     "description": "Lists Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4ad7020e-39ab-49ba-977b-de6084944502/README.md b/src/4ad7020e-39ab-49ba-977b-de6084944502/README.md
index 69cd1e5..e3ce37e 100644
--- a/src/4ad7020e-39ab-49ba-977b-de6084944502/README.md
+++ b/src/4ad7020e-39ab-49ba-977b-de6084944502/README.md
@@ -8,6 +8,7 @@
 ```
 # class Fieldset (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Language**
+> extends: ****
 ```uml
 @startuml
 class Fieldset  #Gold {
diff --git a/src/4ad7020e-39ab-49ba-977b-de6084944502/settings.json b/src/4ad7020e-39ab-49ba-977b-de6084944502/settings.json
index e68e1f5..62d20c1 100644
--- a/src/4ad7020e-39ab-49ba-977b-de6084944502/settings.json
+++ b/src/4ad7020e-39ab-49ba-977b-de6084944502/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4ad7020e-39ab-49ba-977b-de6084944502",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Language.Fieldset",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Language.Fieldset",
     "description": "Compiler Language Fieldset\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/4b86f62e-ce41-4325-a11a-08148807d0df/README.md b/src/4b86f62e-ce41-4325-a11a-08148807d0df/README.md
index 2917836..331fdb7 100644
--- a/src/4b86f62e-ce41-4325-a11a-08148807d0df/README.md
+++ b/src/4b86f62e-ce41-4325-a11a-08148807d0df/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Event (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class Event << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/4b86f62e-ce41-4325-a11a-08148807d0df/code.php b/src/4b86f62e-ce41-4325-a11a-08148807d0df/code.php
index 3e0b206..e376c47 100644
--- a/src/4b86f62e-ce41-4325-a11a-08148807d0df/code.php
+++ b/src/4b86f62e-ce41-4325-a11a-08148807d0df/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaThree;
 
 
 use Joomla\Registry\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface;
 
 
diff --git a/src/4b86f62e-ce41-4325-a11a-08148807d0df/settings.json b/src/4b86f62e-ce41-4325-a11a-08148807d0df/settings.json
index d9213cc..a749336 100644
--- a/src/4b86f62e-ce41-4325-a11a-08148807d0df/settings.json
+++ b/src/4b86f62e-ce41-4325-a11a-08148807d0df/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4b86f62e-ce41-4325-a11a-08148807d0df",
     "implements": [
         "20ed72b0-fcac-4344-aee1-8a65e3bf221d"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaThree.Event",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaThree.Event",
     "description": "Compiler Events\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\Registry\\Registry;",
diff --git a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/README.md b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/README.md
index ad7e0b6..8c4fed5 100644
--- a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/README.md
+++ b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreField (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class CoreField << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/code.php b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/code.php
index 832906c..591fd53 100644
--- a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/code.php
+++ b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface;
 
 
diff --git a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/settings.json b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/settings.json
index 2e7a85f..602db17 100644
--- a/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/settings.json
+++ b/src/4c143764-1b84-4b9f-86c5-8de119b26f1a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4c143764-1b84-4b9f-86c5-8de119b26f1a",
     "implements": [
         "e2f5fddf-cbc8-44ee-836c-7f3fb08d8900"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.CoreField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.CoreField",
     "description": "Core Joomla Fields\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/README.md b/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/README.md
index 4ddd601..40bd1fb 100644
--- a/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/README.md
+++ b/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/README.md
@@ -8,6 +8,7 @@
 ```
 # abstract class Line (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 abstract Line  #Orange {
diff --git a/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/settings.json b/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/settings.json
index dfc9b3d..f5c7513 100644
--- a/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/settings.json
+++ b/src/4e6ff11d-bebf-42f5-8fd7-b2f882857222/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4e6ff11d-bebf-42f5-8fd7-b2f882857222",
     "implements": null,
     "load_selection": null,
@@ -15,6 +15,7 @@
             "as": "Compiler"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Line",
     "description": "The Debug Line Number Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/README.md b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/README.md
index 5236b5b..93bc129 100644
--- a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/README.md
+++ b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/README.md
@@ -8,6 +8,7 @@
 ```
 # class Ajaxadmin (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Ajaxadmin  #Gold {
diff --git a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/code.php b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/code.php
index 6315983..295a752 100644
--- a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/code.php
+++ b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\SiteEditView;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/settings.json b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/settings.json
index ba0ba2e..6cbc09c 100644
--- a/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/settings.json
+++ b/src/4f575bd6-de97-41f8-80d6-259c8a6dd9ad/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "4f575bd6-de97-41f8-80d6-259c8a6dd9ad",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Ajaxadmin",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Ajaxadmin",
     "description": "Model Admin Ajax Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/README.md b/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/README.md
index 84aba84..3e2b384 100644
--- a/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/README.md
+++ b/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/README.md
@@ -8,6 +8,7 @@
 ```
 # abstract class Placefix (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 abstract Placefix  #Orange {
diff --git a/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/settings.json b/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/settings.json
index 073e0a7..c8a1f52 100644
--- a/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/settings.json
+++ b/src/500f3a7f-c16d-4dd4-81b2-2df6776b5388/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "500f3a7f-c16d-4dd4-81b2-2df6776b5388",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Utilities.Placefix",
     "type": "abstract class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Placefix",
     "description": "The Placeholder Prefix and Suffix Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/README.md b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/README.md
index bd18172..f70be9b 100644
--- a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/README.md
+++ b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Search (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Generator**
+> extends: ****
 ```uml
 @startuml
 class Search << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.php b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.php
index f6324ca..ea38aec 100644
--- a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.php
+++ b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.php
@@ -12,10 +12,10 @@
 namespace VDM\Joomla\Componentbuilder\Power\Generator;
 
 
-use VDM\Joomla\Componentbuilder\Power\Database\Load as Database;
+use VDM\Joomla\Data\Action\Load as Database;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Parser;
 use VDM\Joomla\Componentbuilder\Power\Generator\Bucket;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 
 
 /**
@@ -77,7 +77,7 @@ final class Search
 	{
 		if (($power = $this->bucket->get("power.{$guid}")) === null)
 		{
-			if (($power = $this->database->item(['guid' => $guid])) === null)
+			if (($power = $this->database->table('power')->item(['guid' => $guid])) === null)
 			{
 				return null;
 			}
@@ -255,7 +255,7 @@ final class Search
 	{
 		if (($service_providers = $this->bucket->get("service_providers.{$guid}")) === null)
 		{
-			if (($powers = $this->database->items([
+			if (($powers = $this->database->table('power')->items([
 				'use_selection' => [
 					'operator' => 'LIKE',
 					'value' => "'%{$guid}%'",
diff --git a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.power b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.power
index edab118..f1ad364 100644
--- a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.power
+++ b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/code.power
@@ -50,7 +50,7 @@
 	{
 		if (($power = $this->bucket->get("power.{$guid}")) === null)
 		{
-			if (($power = $this->database->item(['guid' => $guid])) === null)
+			if (($power = $this->database->table('power')->item(['guid' => $guid])) === null)
 			{
 				return null;
 			}
@@ -228,7 +228,7 @@
 	{
 		if (($service_providers = $this->bucket->get("service_providers.{$guid}")) === null)
 		{
-			if (($powers = $this->database->items([
+			if (($powers = $this->database->table('power')->items([
 				'use_selection' => [
 					'operator' => 'LIKE',
 					'value' => "'%{$guid}%'",
diff --git a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/settings.json b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/settings.json
index 992eb9c..f517587 100644
--- a/src/50302fce-62b4-48ae-a692-9cc4595ce74c/settings.json
+++ b/src/50302fce-62b4-48ae-a692-9cc4595ce74c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "50302fce-62b4-48ae-a692-9cc4595ce74c",
     "implements": null,
     "load_selection": null,
@@ -11,7 +11,7 @@
     "type": "final class",
     "use_selection": {
         "use_selection0": {
-            "use": "1f86db0f-e271-45df-8795-3e503ec76698",
+            "use": "008d111c-9d43-427c-8dd4-2653e8b74be8",
             "as": "Database"
         },
         "use_selection1": {
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.Search",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.Search",
     "description": "Power code Generator Search of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/505801ac-d3e2-44c6-a300-9a57a96170c6/README.md b/src/505801ac-d3e2-44c6-a300-9a57a96170c6/README.md
index 3c4cca9..2a7aee2 100644
--- a/src/505801ac-d3e2-44c6-a300-9a57a96170c6/README.md
+++ b/src/505801ac-d3e2-44c6-a300-9a57a96170c6/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Generator (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power**
+> extends: ****
 ```uml
 @startuml
 class Generator << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/505801ac-d3e2-44c6-a300-9a57a96170c6/settings.json b/src/505801ac-d3e2-44c6-a300-9a57a96170c6/settings.json
index 9c02a42..87de514 100644
--- a/src/505801ac-d3e2-44c6-a300-9a57a96170c6/settings.json
+++ b/src/505801ac-d3e2-44c6-a300-9a57a96170c6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "505801ac-d3e2-44c6-a300-9a57a96170c6",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "ServiceProvider"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator",
     "description": "Power code Generator of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/507ab90f-7d64-4697-9815-d96f5d1d1185/code.php b/src/507ab90f-7d64-4697-9815-d96f5d1d1185/code.php
index 03da6ad..848cf7c 100644
--- a/src/507ab90f-7d64-4697-9815-d96f5d1d1185/code.php
+++ b/src/507ab90f-7d64-4697-9815-d96f5d1d1185/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/507ab90f-7d64-4697-9815-d96f5d1d1185/settings.json b/src/507ab90f-7d64-4697-9815-d96f5d1d1185/settings.json
index 056685f..353d1e2 100644
--- a/src/507ab90f-7d64-4697-9815-d96f5d1d1185/settings.json
+++ b/src/507ab90f-7d64-4697-9815-d96f5d1d1185/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.GoogleChart",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.GoogleChart",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.GoogleChart",
     "description": "Google Chart Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/README.md b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/README.md
index b0c10fe..edf8524 100644
--- a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/README.md
+++ b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/README.md
@@ -8,6 +8,7 @@
 ```
 # class Gitea (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Service**
+> extends: ****
 ```uml
 @startuml
 class Gitea  #Gold {
diff --git a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/code.php b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/code.php
index f4710ba..7459e6c 100644
--- a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/code.php
+++ b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Power\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use VastDevelopmentMethod\Joomla\Gitea\Repository\Contents;
+use VDM\Joomla\Gitea\Repository\Contents;
 
 
 /**
diff --git a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/settings.json b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/settings.json
index 7ca6a4f..4a7e6dc 100644
--- a/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/settings.json
+++ b/src/510dc0f6-da3f-4a78-b43d-3a03e2cb5fae/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "510dc0f6-da3f-4a78-b43d-3a03e2cb5fae",
     "implements": [
         "-1"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Service.Gitea",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Service.Gitea",
     "description": "Power Gitea Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/5133a033-1351-43ec-9692-2907d7b9aacd/code.php b/src/5133a033-1351-43ec-9692-2907d7b9aacd/code.php
index bbca48d..198ebad 100644
--- a/src/5133a033-1351-43ec-9692-2907d7b9aacd/code.php
+++ b/src/5133a033-1351-43ec-9692-2907d7b9aacd/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/5133a033-1351-43ec-9692-2907d7b9aacd/settings.json b/src/5133a033-1351-43ec-9692-2907d7b9aacd/settings.json
index 6582e3c..0bbfc2e 100644
--- a/src/5133a033-1351-43ec-9692-2907d7b9aacd/settings.json
+++ b/src/5133a033-1351-43ec-9692-2907d7b9aacd/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionFields",
     "description": "Permission Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/README.md b/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/README.md
index a14122c..a23d8fd 100644
--- a/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/README.md
+++ b/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/README.md
@@ -8,6 +8,7 @@
 ```
 # class Utilities (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Utilities  #Gold {
diff --git a/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/settings.json b/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/settings.json
index ee5a0fd..c653e1c 100644
--- a/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/settings.json
+++ b/src/516f93b8-5fff-41c6-aeaf-2d93180a12cc/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "516f93b8-5fff-41c6-aeaf-2d93180a12cc",
     "implements": [
         "-1"
@@ -61,6 +61,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Utilities",
     "description": "Utilities Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/README.md b/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/README.md
index c078a65..d560b06 100644
--- a/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/README.md
+++ b/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/README.md
@@ -8,6 +8,7 @@
 ```
 # interface SuperInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface SuperInterface  #Lavender {
diff --git a/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/settings.json b/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/settings.json
index 3be0ccc..b03e403 100644
--- a/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/settings.json
+++ b/src/51de80f2-2868-4c2c-8198-ef79349e9bd7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "51de80f2-2868-4c2c-8198-ef79349e9bd7",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Super",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.SuperInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Interfaces.SuperInterface",
     "description": "Superpower of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/code.php b/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/code.php
index a24c2e2..368ea1b 100644
--- a/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/code.php
+++ b/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/settings.json b/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/settings.json
index e72da05..4dc82ef 100644
--- a/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/settings.json
+++ b/src/52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteFields",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteFields",
     "description": "Site Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/README.md b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/README.md
index 7efa5cb..85e0d0d 100644
--- a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/README.md
+++ b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/README.md
@@ -8,6 +8,7 @@
 ```
 # class Createdate (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Createdate  #Gold {
diff --git a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/code.php b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/code.php
index 0b40bed..ed522e1 100644
--- a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/code.php
+++ b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
 use Joomla\CMS\Factory;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/settings.json b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/settings.json
index b17241a..fff247d 100644
--- a/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/settings.json
+++ b/src/53cf9828-7ad4-4856-aac1-7c4c67bd3121/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "53cf9828-7ad4-4856-aac1-7c4c67bd3121",
     "implements": null,
     "load_selection": null,
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Createdate",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Createdate",
     "description": "Model - Get Create Date\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/code.php b/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/code.php
index 7dfd3c8..32adf0c 100644
--- a/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/code.php
+++ b/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/settings.json b/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/settings.json
index 40aaa11..54c17d1 100644
--- a/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/settings.json
+++ b/src/54ec57f6-2fc3-42e5-975e-1fabeacb845d/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.UikitComp",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.UikitComp",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.UikitComp",
     "description": "Uikit Comp Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/55278140-80d5-4168-8241-d64515c4b35e/README.md b/src/55278140-80d5-4168-8241-d64515c4b35e/README.md
index ad6e13a..7fd7930 100644
--- a/src/55278140-80d5-4168-8241-d64515c4b35e/README.md
+++ b/src/55278140-80d5-4168-8241-d64515c4b35e/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Builders (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class Builders << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/55278140-80d5-4168-8241-d64515c4b35e/code.php b/src/55278140-80d5-4168-8241-d64515c4b35e/code.php
index 9077708..ada8df7 100644
--- a/src/55278140-80d5-4168-8241-d64515c4b35e/code.php
+++ b/src/55278140-80d5-4168-8241-d64515c4b35e/code.php
@@ -62,10 +62,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\Sort;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Search;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Filter;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ComponentFields;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/55278140-80d5-4168-8241-d64515c4b35e/settings.json b/src/55278140-80d5-4168-8241-d64515c4b35e/settings.json
index 7ed84f6..d390763 100644
--- a/src/55278140-80d5-4168-8241-d64515c4b35e/settings.json
+++ b/src/55278140-80d5-4168-8241-d64515c4b35e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "55278140-80d5-4168-8241-d64515c4b35e",
     "implements": null,
     "load_selection": null,
@@ -215,7 +215,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.Builders",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.Builders",
     "description": "Compiler Creator Builders\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Application\\CMSApplication;",
diff --git a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/README.md b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/README.md
index 082b084..6aebd6a 100644
--- a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/README.md
+++ b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/README.md
@@ -8,6 +8,7 @@
 ```
 # class Conditions (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Conditions  #Gold {
diff --git a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/code.php b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/code.php
index 8f6aeca..e3e59d0 100644
--- a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/code.php
+++ b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/code.php
@@ -16,10 +16,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name as FieldName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Groups as FieldGroups;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 
 /**
diff --git a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/settings.json b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/settings.json
index 9cb2af6..d0ffc34 100644
--- a/src/55e61314-ba10-4e2b-92dd-b44adebabce9/settings.json
+++ b/src/55e61314-ba10-4e2b-92dd-b44adebabce9/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "55e61314-ba10-4e2b-92dd-b44adebabce9",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Conditions",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Conditions",
     "description": "Model Conditions Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/README.md b/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/README.md
index ceeab8c..ed9eeef 100644
--- a/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/README.md
+++ b/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/README.md
@@ -8,6 +8,7 @@
 ```
 # class ArchitectureController (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class ArchitectureController  #Gold {
diff --git a/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/settings.json b/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/settings.json
index bdd58fa..918f2f1 100644
--- a/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/settings.json
+++ b/src/56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60",
     "implements": [
         "-1"
@@ -45,7 +45,8 @@
             "as": "J3ControllerAllowEdit"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.ArchitectureController",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.ArchitectureController",
     "description": "Architecture Controller Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/README.md b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/README.md
index 02568fa..aea4ab4 100644
--- a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/README.md
+++ b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/README.md
@@ -8,6 +8,7 @@
 ```
 # class JoomlaPower (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class JoomlaPower  #Gold {
@@ -17,9 +18,6 @@ class JoomlaPower  #Gold {
   + getGrep(Container $container) : Grep
   + getExtractor(Container $container) : Extractor
   + getInjector(Container $container) : Injector
-  + getModelUpsert(Container $container) : Upsert
-  + getInsert(Container $container) : Insert
-  + getUpdate(Container $container) : Update
 }
 
 note right of JoomlaPower::register
@@ -29,7 +27,7 @@ note right of JoomlaPower::register
   return: void
 end note
 
-note left of JoomlaPower::getPowers
+note right of JoomlaPower::getPowers
   Get the Powers
 
   since: 3.2.0
@@ -43,7 +41,7 @@ note right of JoomlaPower::getSuperpower
   return: Superpower
 end note
 
-note left of JoomlaPower::getGrep
+note right of JoomlaPower::getGrep
   Get the Grep
 
   since: 3.2.0
@@ -57,33 +55,12 @@ note right of JoomlaPower::getExtractor
   return: Extractor
 end note
 
-note left of JoomlaPower::getInjector
+note right of JoomlaPower::getInjector
   Get the Compiler Power Injector
 
   since: 3.2.0
   return: Injector
 end note
-
-note right of JoomlaPower::getModelUpsert
-  Get the Power Model Upsert
-
-  since: 3.2.0
-  return: Upsert
-end note
-
-note left of JoomlaPower::getInsert
-  Get the Power Insert
-
-  since: 3.2.0
-  return: Insert
-end note
-
-note right of JoomlaPower::getUpdate
-  Get the Power Update
-
-  since: 3.2.0
-  return: Update
-end note
  
 @enduml
 ```
diff --git a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.php b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.php
index e51113b..6bb99d4 100644
--- a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.php
+++ b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.php
@@ -19,9 +19,6 @@ use VDM\Joomla\Componentbuilder\JoomlaPower\Grep;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Super as Superpower;
 use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Extractor;
 use VDM\Joomla\Componentbuilder\Compiler\JoomlaPower\Injector;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Model\Upsert;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Database\Insert;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Database\Update;
 
 
 /**
@@ -55,15 +52,6 @@ class JoomlaPower implements ServiceProviderInterface
 
 		$container->alias(Injector::class, 'Joomla.Power.Injector')
 			->share('Joomla.Power.Injector', [$this, 'getInjector'], true);
-
-		$container->alias(Upsert::class, 'Joomla.Power.Model.Upsert')
-			->share('Joomla.Power.Model.Upsert', [$this, 'getModelUpsert'], true);
-
-		$container->alias(Insert::class, 'Joomla.Power.Insert')
-			->share('Joomla.Power.Insert', [$this, 'getInsert'], true);
-
-		$container->alias(Update::class, 'Joomla.Power.Update')
-			->share('Joomla.Power.Update', [$this, 'getUpdate'], true);
 	}
 
 	/**
@@ -97,8 +85,7 @@ class JoomlaPower implements ServiceProviderInterface
 	{
 		return new Superpower(
 			$container->get('Joomla.Power.Grep'),
-			$container->get('Joomla.Power.Insert'),
-			$container->get('Joomla.Power.Update')
+			$container->get('Data.Item')
 		);
 	}
 
@@ -113,9 +100,8 @@ class JoomlaPower implements ServiceProviderInterface
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_joomla_powers_repository_path,
-			$container->get('Config')->approved_joomla_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Gitea.Repository.Contents'),
+			$container->get('Config')->approved_joomla_paths
 		);
 	}
 
@@ -150,53 +136,6 @@ class JoomlaPower implements ServiceProviderInterface
 			$container->get('Power.Parser'),
 			$container->get('Placeholder')
 		);
-	}
-
-	/**
-	 * Get the Power Model Upsert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Upsert
-	 * @since 3.2.0
-	 */
-	public function getModelUpsert(Container $container): Upsert
-	{
-		return new Upsert(
-			$container->get('Table')
-		);
-	}
-
-	/**
-	 * Get the Power Insert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Insert
-	 * @since 3.2.0
-	 */
-	public function getInsert(Container $container): Insert
-	{
-		return new Insert(
-			$container->get('Joomla.Power.Model.Upsert'),
-			$container->get('Insert')
-		);
-	}
-
-	/**
-	 * Get the Power Update
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Update
-	 * @since 3.2.0
-	 */
-	public function getUpdate(Container $container): Update
-	{
-		return new Update(
-			$container->get('Joomla.Power.Model.Upsert'),
-			$container->get('Update')
-		);
 	}
 }
 
diff --git a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.power b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.power
index 5160c12..f9c3517 100644
--- a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.power
+++ b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/code.power
@@ -22,15 +22,6 @@
 
 		$container->alias(Injector::class, 'Joomla.Power.Injector')
 			->share('Joomla.Power.Injector', [$this, 'getInjector'], true);
-
-		$container->alias(Upsert::class, 'Joomla.Power.Model.Upsert')
-			->share('Joomla.Power.Model.Upsert', [$this, 'getModelUpsert'], true);
-
-		$container->alias(Insert::class, 'Joomla.Power.Insert')
-			->share('Joomla.Power.Insert', [$this, 'getInsert'], true);
-
-		$container->alias(Update::class, 'Joomla.Power.Update')
-			->share('Joomla.Power.Update', [$this, 'getUpdate'], true);
 	}
 
 	/**
@@ -64,8 +55,7 @@
 	{
 		return new Superpower(
 			$container->get('Joomla.Power.Grep'),
-			$container->get('Joomla.Power.Insert'),
-			$container->get('Joomla.Power.Update')
+			$container->get('Data.Item')
 		);
 	}
 
@@ -80,9 +70,8 @@
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_joomla_powers_repository_path,
-			$container->get('Config')->approved_joomla_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Gitea.Repository.Contents'),
+			$container->get('Config')->approved_joomla_paths
 		);
 	}
 
@@ -117,51 +106,4 @@
 			$container->get('Power.Parser'),
 			$container->get('Placeholder')
 		);
-	}
-
-	/**
-	 * Get the Power Model Upsert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Upsert
-	 * @since 3.2.0
-	 */
-	public function getModelUpsert(Container $container): Upsert
-	{
-		return new Upsert(
-			$container->get('Table')
-		);
-	}
-
-	/**
-	 * Get the Power Insert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Insert
-	 * @since 3.2.0
-	 */
-	public function getInsert(Container $container): Insert
-	{
-		return new Insert(
-			$container->get('Joomla.Power.Model.Upsert'),
-			$container->get('Insert')
-		);
-	}
-
-	/**
-	 * Get the Power Update
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Update
-	 * @since 3.2.0
-	 */
-	public function getUpdate(Container $container): Update
-	{
-		return new Update(
-			$container->get('Joomla.Power.Model.Upsert'),
-			$container->get('Update')
-		);
 	}
\ No newline at end of file
diff --git a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/settings.json b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/settings.json
index f99ec47..8f456ea 100644
--- a/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/settings.json
+++ b/src/5716c79f-a1c9-4059-9d00-8cccb9f9e061/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5716c79f-a1c9-4059-9d00-8cccb9f9e061",
     "implements": [
         "-1"
@@ -31,21 +31,10 @@
         "use_selection4": {
             "use": "a6052fe9-0d2b-4b36-b3e7-03b47c483542",
             "as": "default"
-        },
-        "use_selection5": {
-            "use": "9206082e-a3f7-472e-98b2-de90d06cbdcd",
-            "as": "default"
-        },
-        "use_selection6": {
-            "use": "9d53d45e-9b4d-45ec-827b-4916b91c907e",
-            "as": "default"
-        },
-        "use_selection7": {
-            "use": "679473f6-3ea2-49d5-8273-1b29c8f0ad2b",
-            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.JoomlaPower",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.JoomlaPower",
     "description": "Compiler Joomla Power Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/58b7f907-4195-4ca3-886c-17877be59887/code.php b/src/58b7f907-4195-4ca3-886c-17877be59887/code.php
index 21ea6ac..5e73779 100644
--- a/src/58b7f907-4195-4ca3-886c-17877be59887/code.php
+++ b/src/58b7f907-4195-4ca3-886c-17877be59887/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/58b7f907-4195-4ca3-886c-17877be59887/settings.json b/src/58b7f907-4195-4ca3-886c-17877be59887/settings.json
index 43cd8d5..0769004 100644
--- a/src/58b7f907-4195-4ca3-886c-17877be59887/settings.json
+++ b/src/58b7f907-4195-4ca3-886c-17877be59887/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.DatabaseUniqueGuid",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUniqueGuid",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUniqueGuid",
     "description": "Database Unique Guid Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/README.md b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/README.md
index 796583c..ed53912 100644
--- a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/README.md
+++ b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/README.md
@@ -8,6 +8,7 @@
 ```
 # class Ajaxcustomview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Ajaxcustomview  #Gold {
diff --git a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/code.php b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/code.php
index c759fb4..e4e0d39 100644
--- a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/code.php
+++ b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/settings.json b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/settings.json
index 4e43102..db6d73b 100644
--- a/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/settings.json
+++ b/src/592aed4e-2c5f-4fc5-8f7a-409203d1af82/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "592aed4e-2c5f-4fc5-8f7a-409203d1af82",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Ajaxcustomview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Ajaxcustomview",
     "description": "Model Custom Ajax Custom View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/code.php b/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/code.php
index b7d292c..fa6864a 100644
--- a/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/code.php
+++ b/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/settings.json b/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/settings.json
index d61b997..07d4d6f 100644
--- a/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/settings.json
+++ b/src/597663e1-1c02-43e8-aea5-f2161e38ac7f/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ListJoin",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ListJoin",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ListJoin",
     "description": "List Join Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/59895f37-50c8-4af3-9dad-230e18841953/README.md b/src/59895f37-50c8-4af3-9dad-230e18841953/README.md
index 496db1a..0d71c4c 100644
--- a/src/59895f37-50c8-4af3-9dad-230e18841953/README.md
+++ b/src/59895f37-50c8-4af3-9dad-230e18841953/README.md
@@ -8,6 +8,7 @@
 ```
 # class Libraries (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Libraries  #Gold {
diff --git a/src/59895f37-50c8-4af3-9dad-230e18841953/code.php b/src/59895f37-50c8-4af3-9dad-230e18841953/code.php
index c2d115f..f39b75f 100644
--- a/src/59895f37-50c8-4af3-9dad-230e18841953/code.php
+++ b/src/59895f37-50c8-4af3-9dad-230e18841953/code.php
@@ -16,8 +16,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\LibraryManager;
 use VDM\Joomla\Componentbuilder\Compiler\Library\Data as Library;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/59895f37-50c8-4af3-9dad-230e18841953/settings.json b/src/59895f37-50c8-4af3-9dad-230e18841953/settings.json
index c32664d..32bac27 100644
--- a/src/59895f37-50c8-4af3-9dad-230e18841953/settings.json
+++ b/src/59895f37-50c8-4af3-9dad-230e18841953/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "59895f37-50c8-4af3-9dad-230e18841953",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Libraries",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Libraries",
     "description": "Model Libraries Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5b021139-dad0-4e9b-882a-2b4d807795af/README.md b/src/5b021139-dad0-4e9b-882a-2b4d807795af/README.md
index 34f4561..f4a2c1f 100644
--- a/src/5b021139-dad0-4e9b-882a-2b4d807795af/README.md
+++ b/src/5b021139-dad0-4e9b-882a-2b4d807795af/README.md
@@ -8,6 +8,7 @@
 ```
 # class Selection (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Dynamicget**
+> extends: ****
 ```uml
 @startuml
 class Selection  #Gold {
diff --git a/src/5b021139-dad0-4e9b-882a-2b4d807795af/code.php b/src/5b021139-dad0-4e9b-882a-2b4d807795af/code.php
index 7bdd952..f1daa85 100644
--- a/src/5b021139-dad0-4e9b-882a-2b4d807795af/code.php
+++ b/src/5b021139-dad0-4e9b-882a-2b4d807795af/code.php
@@ -16,10 +16,10 @@ use Joomla\CMS\Factory;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\GetAsLookup;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\SiteFields;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\Component\Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 
 
diff --git a/src/5b021139-dad0-4e9b-882a-2b4d807795af/settings.json b/src/5b021139-dad0-4e9b-882a-2b4d807795af/settings.json
index 72f9155..7a67457 100644
--- a/src/5b021139-dad0-4e9b-882a-2b4d807795af/settings.json
+++ b/src/5b021139-dad0-4e9b-882a-2b4d807795af/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5b021139-dad0-4e9b-882a-2b4d807795af",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Dynamicget.Selection",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Dynamicget.Selection",
     "description": "Dynamic Get Selection Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/5c75b455-3d4c-452a-867e-e90424a64c88/README.md b/src/5c75b455-3d4c-452a-867e-e90424a64c88/README.md
index 53a7983..54d2b26 100644
--- a/src/5c75b455-3d4c-452a-867e-e90424a64c88/README.md
+++ b/src/5c75b455-3d4c-452a-867e-e90424a64c88/README.md
@@ -8,6 +8,7 @@
 ```
 # class File (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class File  #Gold {
diff --git a/src/5c75b455-3d4c-452a-867e-e90424a64c88/code.php b/src/5c75b455-3d4c-452a-867e-e90424a64c88/code.php
index 1eaf600..a6046da 100644
--- a/src/5c75b455-3d4c-452a-867e-e90424a64c88/code.php
+++ b/src/5c75b455-3d4c-452a-867e-e90424a64c88/code.php
@@ -16,7 +16,7 @@ use Joomla\CMS\Filesystem\File as JoomlaFile;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\FileHelper;
 
 
 /**
diff --git a/src/5c75b455-3d4c-452a-867e-e90424a64c88/settings.json b/src/5c75b455-3d4c-452a-867e-e90424a64c88/settings.json
index 84c368c..a890135 100644
--- a/src/5c75b455-3d4c-452a-867e-e90424a64c88/settings.json
+++ b/src/5c75b455-3d4c-452a-867e-e90424a64c88/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5c75b455-3d4c-452a-867e-e90424a64c88",
     "implements": null,
     "load_selection": null,
@@ -27,6 +27,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.File",
     "description": "File helper\r\n\r\n@since  3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    3rd September, 2020\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/5d4278f0-7db2-498f-872a-c974bd8ce334/code.php b/src/5d4278f0-7db2-498f-872a-c974bd8ce334/code.php
index 3f342bf..bf2ee7b 100644
--- a/src/5d4278f0-7db2-498f-872a-c974bd8ce334/code.php
+++ b/src/5d4278f0-7db2-498f-872a-c974bd8ce334/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Power\Generator;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/5d4278f0-7db2-498f-872a-c974bd8ce334/settings.json b/src/5d4278f0-7db2-498f-872a-c974bd8ce334/settings.json
index 78a97df..746e16b 100644
--- a/src/5d4278f0-7db2-498f-872a-c974bd8ce334/settings.json
+++ b/src/5d4278f0-7db2-498f-872a-c974bd8ce334/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Power.Generator.Bucket",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.Bucket",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.Bucket",
     "description": "Power Bucket\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5e3d856d-8174-4131-b4e9-9328066438e1/code.php b/src/5e3d856d-8174-4131-b4e9-9328066438e1/code.php
index 8c91ee7..3c6e084 100644
--- a/src/5e3d856d-8174-4131-b4e9-9328066438e1/code.php
+++ b/src/5e3d856d-8174-4131-b4e9-9328066438e1/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/5e3d856d-8174-4131-b4e9-9328066438e1/settings.json b/src/5e3d856d-8174-4131-b4e9-9328066438e1/settings.json
index 138168b..7462620 100644
--- a/src/5e3d856d-8174-4131-b4e9-9328066438e1/settings.json
+++ b/src/5e3d856d-8174-4131-b4e9-9328066438e1/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.PermissionCore",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionCore",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionCore",
     "description": "Permission Core Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/README.md b/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/README.md
index 1d7183a..67e5033 100644
--- a/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/README.md
+++ b/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsEncryption (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsEncryption << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/settings.json b/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/settings.json
index 13de8a2..161fcf2 100644
--- a/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/settings.json
+++ b/src/5e3fc314-646b-4834-8b1a-1a79f3d4d2ab/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5e3fc314-646b-4834-8b1a-1a79f3d4d2ab",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsEncryption",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsEncryption",
     "description": "Config Fieldsets Encryption Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/README.md b/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/README.md
index 0aecddf..9c60df5 100644
--- a/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/README.md
+++ b/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/README.md
@@ -8,6 +8,7 @@
 ```
 # interface SettingsInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component**
+> extends: ****
 ```uml
 @startuml
 interface SettingsInterface  #Lavender {
diff --git a/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/settings.json b/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/settings.json
index 69e7b32..9156791 100644
--- a/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/settings.json
+++ b/src/5f44e66a-31d0-45ff-92b3-b7372dc57ae9/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5f44e66a-31d0-45ff-92b3-b7372dc57ae9",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.SettingsInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Component.SettingsInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Component.SettingsInterface",
     "description": "Compiler Component Settings Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/code.php b/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/code.php
index 283d23d..5fd4829 100644
--- a/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/code.php
+++ b/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/code.php
@@ -13,9 +13,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/settings.json b/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/settings.json
index e8abd5e..9847a3e 100644
--- a/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/settings.json
+++ b/src/5f57ff1a-c196-45b1-a2ac-33766b44fb95/settings.json
@@ -21,7 +21,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ContentMulti",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ContentMulti",
     "description": "Compiler Content Multi\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/README.md b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/README.md
index ead83b3..35b4bac 100644
--- a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/README.md
+++ b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customalias (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Customalias  #Gold {
diff --git a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/code.php b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/code.php
index 1f2e383..1ed1042 100644
--- a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/code.php
+++ b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Builder\CustomAlias as BuilderCustomAlias;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name as FieldName;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/settings.json b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/settings.json
index 712456e..3992771 100644
--- a/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/settings.json
+++ b/src/5f8e8fa6-3793-44af-882d-9cfb209434e9/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "5f8e8fa6-3793-44af-882d-9cfb209434e9",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Customalias",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Customalias",
     "description": "Model Custom Alias Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/600515b1-493f-4448-96fe-018e54e087c8/README.md b/src/600515b1-493f-4448-96fe-018e54e087c8/README.md
index 41a1190..af9f06c 100644
--- a/src/600515b1-493f-4448-96fe-018e54e087c8/README.md
+++ b/src/600515b1-493f-4448-96fe-018e54e087c8/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CanEditStateInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Architecture\Model**
+> extends: ****
 ```uml
 @startuml
 interface CanEditStateInterface  #Lavender {
diff --git a/src/600515b1-493f-4448-96fe-018e54e087c8/settings.json b/src/600515b1-493f-4448-96fe-018e54e087c8/settings.json
index d20a9e0..f5fb9e7 100644
--- a/src/600515b1-493f-4448-96fe-018e54e087c8/settings.json
+++ b/src/600515b1-493f-4448-96fe-018e54e087c8/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "600515b1-493f-4448-96fe-018e54e087c8",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Architecture.Model.CanEditState",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Model.CanEditStateInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Model.CanEditStateInterface",
     "description": "Model Can Edit State Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6034587d-82a3-4b19-ac58-40507f79122a/README.md b/src/6034587d-82a3-4b19-ac58-40507f79122a/README.md
index 4f88f7a..ff964df 100644
--- a/src/6034587d-82a3-4b19-ac58-40507f79122a/README.md
+++ b/src/6034587d-82a3-4b19-ac58-40507f79122a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class RouterMethodsManual (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class RouterMethodsManual << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/6034587d-82a3-4b19-ac58-40507f79122a/settings.json b/src/6034587d-82a3-4b19-ac58-40507f79122a/settings.json
index bfdf01b..eb724d0 100644
--- a/src/6034587d-82a3-4b19-ac58-40507f79122a/settings.json
+++ b/src/6034587d-82a3-4b19-ac58-40507f79122a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6034587d-82a3-4b19-ac58-40507f79122a",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.RouterMethodsManual",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.RouterMethodsManual",
     "description": "Router Methods Manual Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/63782f74-7b03-4745-aa40-0adf8ed4e704/README.md b/src/63782f74-7b03-4745-aa40-0adf8ed4e704/README.md
index 7c6a739..109ef45 100644
--- a/src/63782f74-7b03-4745-aa40-0adf8ed4e704/README.md
+++ b/src/63782f74-7b03-4745-aa40-0adf8ed4e704/README.md
@@ -8,6 +8,7 @@
 ```
 # class History (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class History  #Gold {
diff --git a/src/63782f74-7b03-4745-aa40-0adf8ed4e704/settings.json b/src/63782f74-7b03-4745-aa40-0adf8ed4e704/settings.json
index 2fa2e25..371861e 100644
--- a/src/63782f74-7b03-4745-aa40-0adf8ed4e704/settings.json
+++ b/src/63782f74-7b03-4745-aa40-0adf8ed4e704/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "63782f74-7b03-4745-aa40-0adf8ed4e704",
     "implements": [
         "-1"
@@ -29,6 +29,7 @@
             "as": "J5History"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.History",
     "description": "History Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/README.md b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/README.md
index 98d4f43..9bfb914 100644
--- a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/README.md
+++ b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Settings (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class Settings << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/code.php b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/code.php
index fd18e4b..fe56328 100644
--- a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/code.php
+++ b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/code.php
@@ -21,9 +21,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Component;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Dynamicpath;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Pathfix;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component\SettingsInterface;
 
 
diff --git a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/settings.json b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/settings.json
index d5856dc..4f4c20e 100644
--- a/src/63dabe82-0f4a-4ade-9851-8518ade23de2/settings.json
+++ b/src/63dabe82-0f4a-4ade-9851-8518ade23de2/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "63dabe82-0f4a-4ade-9851-8518ade23de2",
     "implements": [
         "5f44e66a-31d0-45ff-92b3-b7372dc57ae9"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.JoomlaThree.Settings",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.JoomlaThree.Settings",
     "description": "Compiler Component (Joomla Version) Settings\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/code.php b/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/code.php
index 1402c97..8408d2b 100644
--- a/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/code.php
+++ b/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/settings.json b/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/settings.json
index 38ffa9d..babc13e 100644
--- a/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/settings.json
+++ b/src/66b7b5f8-60d6-427a-9f8c-84c11a3d6780/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OrderZero",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OrderZero",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OrderZero",
     "description": "Order Zero Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/673954d3-78d3-445a-b99f-4b40d617c882/README.md b/src/673954d3-78d3-445a-b99f-4b40d617c882/README.md
index b7d1239..2d77de4 100644
--- a/src/673954d3-78d3-445a-b99f-4b40d617c882/README.md
+++ b/src/673954d3-78d3-445a-b99f-4b40d617c882/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Structuresingle (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Structuresingle << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/673954d3-78d3-445a-b99f-4b40d617c882/code.php b/src/673954d3-78d3-445a-b99f-4b40d617c882/code.php
index a1e783f..3e88c3a 100644
--- a/src/673954d3-78d3-445a-b99f-4b40d617c882/code.php
+++ b/src/673954d3-78d3-445a-b99f-4b40d617c882/code.php
@@ -26,7 +26,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\ContentOne as Content;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Files;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 
 
diff --git a/src/673954d3-78d3-445a-b99f-4b40d617c882/settings.json b/src/673954d3-78d3-445a-b99f-4b40d617c882/settings.json
index 7c6e7f3..7ac3bc7 100644
--- a/src/673954d3-78d3-445a-b99f-4b40d617c882/settings.json
+++ b/src/673954d3-78d3-445a-b99f-4b40d617c882/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "673954d3-78d3-445a-b99f-4b40d617c882",
     "implements": null,
     "load_selection": null,
@@ -55,7 +55,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Structuresingle",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Structuresingle",
     "description": "Single Files and Folders Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Filesystem\\Folder;\r\nuse Joomla\\CMS\\Filesystem\\File;",
diff --git a/src/6784dd52-0909-451a-a872-9a942a023c68/README.md b/src/6784dd52-0909-451a-a872-9a942a023c68/README.md
index 8ef01c0..c38994f 100644
--- a/src/6784dd52-0909-451a-a872-9a942a023c68/README.md
+++ b/src/6784dd52-0909-451a-a872-9a942a023c68/README.md
@@ -13,12 +13,12 @@
 @startuml
 class Grep << (F,LightGreen) >> #RoyalBlue {
   # remoteIndex(object $path) : void
-  - searchLocal(string $guid) : ?object
-  - searchRemote(string $guid) : ?object
-  - getLocal(object $path, string $guid) : ?object
-  - getRemote(object $path, string $guid) : ?object
-  - loadRemoteFile(string $owner, string $repo, ...) : mixed
-  - localIndex(object $path) : void
+  # searchLocal(string $guid) : ?object
+  # searchRemote(string $guid) : ?object
+  # getLocal(object $path, string $guid) : ?object
+  # getRemote(object $path, string $guid) : ?object
+  # loadRemoteFile(string $organisation, string $repository, ...) : mixed
+  # localIndex(object $path) : void
 }
 
 note right of Grep::remoteIndex
@@ -63,8 +63,8 @@ note right of Grep::loadRemoteFile
   return: mixed
   
   arguments:
-    string $owner
-    string $repo
+    string $organisation
+    string $repository
     string $path
     ?string $branch
 end note
diff --git a/src/6784dd52-0909-451a-a872-9a942a023c68/code.php b/src/6784dd52-0909-451a-a872-9a942a023c68/code.php
index 5989bd9..bbcb773 100644
--- a/src/6784dd52-0909-451a-a872-9a942a023c68/code.php
+++ b/src/6784dd52-0909-451a-a872-9a942a023c68/code.php
@@ -13,10 +13,10 @@ namespace VDM\Joomla\Componentbuilder\Power;
 
 
 use Joomla\CMS\Language\Text;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Interfaces\GrepInterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Grep as ExtendingGrep;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Interfaces\GrepInterface;
+use VDM\Joomla\Abstraction\Grep as ExtendingGrep;
 
 
 /**
@@ -48,14 +48,28 @@ final class Grep extends ExtendingGrep implements GrepInterface
 
 		try
 		{
-			$path->index = $this->contents->get($path->owner, $path->repo, 'super-powers.json', $path->branch);
+			$this->contents->load_($path->base ?? null, $path->token ?? null);
+			$path->index = $this->contents->get($path->organisation, $path->repository, 'super-powers.json', $path->read_branch);
+			$this->contents->reset_();
 		}
 		catch (\Exception $e)
 		{
-			$this->app->enqueueMessage(
-				Text::sprintf('COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BSSB_GAVE_THE_FOLLOWING_ERRORBR_SP', $this->contents->api(), $path->path, $e->getMessage()),
-				'Error'
-			);
+			if ('super-powers' === $path->repository && 'joomla' !== $path->organisation && (empty($path->base) || $path->base === 'https://git.vdm.dev'))
+			{
+				// give heads-up about the overriding feature
+				$this->app->enqueueMessage(
+					Text::sprintf('COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BHTTPSGITVDMDEVSB_CAN_BE_USED_TO_OVERRIDE_ANY_POWERBR_BUT_HAS_NOT_YET_BEEN_SET_IN_YOUR_ACCOUNT_AT_HTTPSGITVDMDEVSBR_SMALLTHIS_IS_AND_OPTIONAL_FEATURESMALL', $path->path, $path->organisation),
+					'Message'
+				);
+			}
+			else
+			{
+				// give error
+				$this->app->enqueueMessage(
+					Text::sprintf('COM_COMPONENTBUILDER_PSUPER_POWERB_REPOSITORY_AT_BSSB_GAVE_THE_FOLLOWING_ERRORBR_SP', $this->contents->api(), $path->path, $e->getMessage()),
+					'Error'
+				);
+			}
 
 			$path->index = null;
 		}
@@ -69,7 +83,7 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchLocal(string $guid): ?object
+	protected function searchLocal(string $guid): ?object
 	{
 		// we can only search if we have paths
 		if ($this->path && $this->paths)
@@ -97,7 +111,7 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchRemote(string $guid): ?object
+	protected function searchRemote(string $guid): ?object
 	{
 		// we can only search if we have paths
 		if ($this->path && $this->paths)
@@ -126,7 +140,7 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getLocal(object $path, string $guid): ?object
+	protected function getLocal(object $path, string $guid): ?object
 	{
 		if (empty($path->local->{$guid}->settings) || empty($path->local->{$guid}->code))
 		{
@@ -159,44 +173,50 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getRemote(object $path, string $guid): ?object
+	protected function getRemote(object $path, string $guid): ?object
 	{
+		$power = null;
 		if (empty($path->index->{$guid}->settings) || empty($path->index->{$guid}->code))
 		{
-			return null;
+			return $power;
 		}
 
 		// get the settings
-		if (($power = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->settings, $path->branch)) !== null &&
+		$this->contents->load_($path->base ?? null, $path->token ?? null);
+		if (($power = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->settings, $path->read_branch)) !== null &&
 			isset($power->guid))
 		{
 			// get the code
-			if (($code = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->power, $path->branch)) !== null)
+			if (($code = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->power, $path->read_branch)) !== null)
 			{
+				// set the git details in params
+				$power->params = (object) [
+					'source' => ['guid' => $path->guid ?? null]
+				];
 				$power->main_class_code = $code;
-				return $power;
 			}
 		}
+		$this->contents->reset_();
 
-		return null;
+		return $power;
 	}
 
 	/**
 	 * Load the remote file
 	 *
-	 * @param string         $owner    The repository owner
-	 * @param string         $repo     The repository name
-	 * @param string         $path     The repository path to file
-	 * @param string|null    $branch   The repository branch name
+	 * @param string         $organisation  The repository organisation
+	 * @param string         $repository    The repository name
+	 * @param string         $path          The repository path to file
+	 * @param string|null    $branch        The repository branch name
 	 *
 	 * @return mixed
 	 * @since 3.2.0
 	 */
-	private function loadRemoteFile(string $owner, string $repo, string $path, ?string $branch)
+	protected function loadRemoteFile(string $organisation, string $repository, string $path, ?string $branch)
 	{
 		try
 		{
-			$data = $this->contents->get($owner, $repo, $path, $branch);
+			$data = $this->contents->get($organisation, $repository, $path, $branch);
 		}
 		catch (\Exception $e)
 		{
@@ -219,7 +239,7 @@ final class Grep extends ExtendingGrep implements GrepInterface
 	 * @return void
 	 * @since 3.2.0
 	 */
-	private function localIndex(object &$path)
+	protected function localIndex(object &$path)
 	{
 		if (isset($path->local) || !isset($path->full_path))
 		{
diff --git a/src/6784dd52-0909-451a-a872-9a942a023c68/code.power b/src/6784dd52-0909-451a-a872-9a942a023c68/code.power
index 6695d78..f30816c 100644
--- a/src/6784dd52-0909-451a-a872-9a942a023c68/code.power
+++ b/src/6784dd52-0909-451a-a872-9a942a023c68/code.power
@@ -15,14 +15,28 @@
 
 		try
 		{
-			$path->index = $this->contents->get($path->owner, $path->repo, 'super-powers.json', $path->branch);
+			$this->contents->load_($path->base ?? null, $path->token ?? null);
+			$path->index = $this->contents->get($path->organisation, $path->repository, 'super-powers.json', $path->read_branch);
+			$this->contents->reset_();
 		}
 		catch (\Exception $e)
 		{
-			$this->app->enqueueMessage(
-				Text::sprintf('<p>Super Power</b> repository at <b>%s/%s</b> gave the following error!<br />%s</p>', $this->contents->api(), $path->path, $e->getMessage()),
-				'Error'
-			);
+			if ('super-powers' === $path->repository && 'joomla' !== $path->organisation && (empty($path->base) || $path->base === 'https://git.vdm.dev'))
+			{
+				// give heads-up about the overriding feature
+				$this->app->enqueueMessage(
+					Text::sprintf('<p>Super Power</b> repository at <b>https://git.vdm.dev/%s</b> can be used to override any power!<br />But has not yet been set in your account at https://git.vdm.dev/%s<br /><small>This is and optional feature.</small>', $path->path, $path->organisation),
+					'Message'
+				);
+			}
+			else
+			{
+				// give error
+				$this->app->enqueueMessage(
+					Text::sprintf('<p>Super Power</b> repository at <b>%s/%s</b> gave the following error!<br />%s</p>', $this->contents->api(), $path->path, $e->getMessage()),
+					'Error'
+				);
+			}
 
 			$path->index = null;
 		}
@@ -36,7 +50,7 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchLocal(string $guid): ?object
+	protected function searchLocal(string $guid): ?object
 	{
 		// we can only search if we have paths
 		if ($this->path && $this->paths)
@@ -64,7 +78,7 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function searchRemote(string $guid): ?object
+	protected function searchRemote(string $guid): ?object
 	{
 		// we can only search if we have paths
 		if ($this->path && $this->paths)
@@ -93,7 +107,7 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getLocal(object $path, string $guid): ?object
+	protected function getLocal(object $path, string $guid): ?object
 	{
 		if (empty($path->local->{$guid}->settings) || empty($path->local->{$guid}->code))
 		{
@@ -126,44 +140,50 @@
 	 * @return object|null
 	 * @since 3.2.0
 	 */
-	private function getRemote(object $path, string $guid): ?object
+	protected function getRemote(object $path, string $guid): ?object
 	{
+		$power = null;
 		if (empty($path->index->{$guid}->settings) || empty($path->index->{$guid}->code))
 		{
-			return null;
+			return $power;
 		}
 
 		// get the settings
-		if (($power = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->settings, $path->branch)) !== null &&
+		$this->contents->load_($path->base ?? null, $path->token ?? null);
+		if (($power = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->settings, $path->read_branch)) !== null &&
 			isset($power->guid))
 		{
 			// get the code
-			if (($code = $this->loadRemoteFile($path->owner, $path->repo, $path->index->{$guid}->power, $path->branch)) !== null)
+			if (($code = $this->loadRemoteFile($path->organisation, $path->repository, $path->index->{$guid}->power, $path->read_branch)) !== null)
 			{
+				// set the git details in params
+				$power->params = (object) [
+					'source' => ['guid' => $path->guid ?? null]
+				];
 				$power->main_class_code = $code;
-				return $power;
 			}
 		}
+		$this->contents->reset_();
 
-		return null;
+		return $power;
 	}
 
 	/**
 	 * Load the remote file
 	 *
-	 * @param string         $owner    The repository owner
-	 * @param string         $repo     The repository name
-	 * @param string         $path     The repository path to file
-	 * @param string|null    $branch   The repository branch name
+	 * @param string         $organisation  The repository organisation
+	 * @param string         $repository    The repository name
+	 * @param string         $path          The repository path to file
+	 * @param string|null    $branch        The repository branch name
 	 *
 	 * @return mixed
 	 * @since 3.2.0
 	 */
-	private function loadRemoteFile(string $owner, string $repo, string $path, ?string $branch)
+	protected function loadRemoteFile(string $organisation, string $repository, string $path, ?string $branch)
 	{
 		try
 		{
-			$data = $this->contents->get($owner, $repo, $path, $branch);
+			$data = $this->contents->get($organisation, $repository, $path, $branch);
 		}
 		catch (\Exception $e)
 		{
@@ -186,7 +206,7 @@
 	 * @return void
 	 * @since 3.2.0
 	 */
-	private function localIndex(object &$path)
+	protected function localIndex(object &$path)
 	{
 		if (isset($path->local) || !isset($path->full_path))
 		{
diff --git a/src/6784dd52-0909-451a-a872-9a942a023c68/settings.json b/src/6784dd52-0909-451a-a872-9a942a023c68/settings.json
index 3f59c97..ee165eb 100644
--- a/src/6784dd52-0909-451a-a872-9a942a023c68/settings.json
+++ b/src/6784dd52-0909-451a-a872-9a942a023c68/settings.json
@@ -21,7 +21,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Grep",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Grep",
     "description": "Global Resource Empowerment Platform\r\n\r\n   The Grep feature will try to find your power in the repositories listed in the global\r\n   Options of JCB in the super powers tab, and if it can't be found there will try the global core\r\n   Super powers of JCB. All searches are performed according the the [algorithm:cascading]\r\n   See documentation for more details: https:\/\/git.vdm.dev\/joomla\/super-powers\/wiki\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Language\\Text;",
diff --git a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/README.md b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/README.md
index 478eb18..c2049a7 100644
--- a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/README.md
+++ b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/README.md
@@ -7,7 +7,7 @@
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
 # final class Update (Details)
-> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Database**
+> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Data**
 > extends: **ExtendingUpdate**
 ```uml
 @startuml
diff --git a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/code.php b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/code.php
index 65dd0f3..3920a04 100644
--- a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/code.php
+++ b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/code.php
@@ -9,17 +9,17 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\JoomlaPower\Database;
+namespace VDM\Joomla\Componentbuilder\JoomlaPower\Data;
 
 
-use VDM\Joomla\Componentbuilder\Interfaces\Database\UpdateInterface;
-use VDM\Joomla\Componentbuilder\Power\Database\Update as ExtendingUpdate;
+use VDM\Joomla\Interfaces\Data\UpdateInterface;
+use VDM\Joomla\Abstraction\Data\Update as ExtendingUpdate;
 
 
 /**
- * Joomla Power Database Update
+ * Joomla Power Data Update (GUID)
  * 
- * @since 3.2.0
+ * @since 3.2.2
  */
 final class Update extends ExtendingUpdate implements UpdateInterface
 {
diff --git a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/settings.json b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/settings.json
index 8754296..b52f651 100644
--- a/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/settings.json
+++ b/src/679473f6-3ea2-49d5-8273-1b29c8f0ad2b/settings.json
@@ -1,19 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "e543c123-b1d9-4a0b-83b2-a9d371da5ff3",
+    "extends": "8f83fb79-f92b-4f1f-952b-325f6c22d11e",
     "guid": "679473f6-3ea2-49d5-8273-1b29c8f0ad2b",
     "implements": [
-        "69c29be3-ab25-4f56-944e-7ada6307b10c"
+        "68a41264-64c0-441a-a3d8-8a5e557b1883"
     ],
     "load_selection": null,
     "name": "Update",
     "power_version": "1.0.0",
-    "system_name": "JCB.JoomlaPower.Database.Update",
+    "system_name": "JCB.JoomlaPower.Data.Update",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Database.Update",
-    "description": "Joomla Power Database Update\r\n\r\n@since 3.2.0",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Data.Update",
+    "description": "Joomla Power Data Update (GUID)\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/6992384f-4f29-489f-a52e-286e03f4593b/code.php b/src/6992384f-4f29-489f-a52e-286e03f4593b/code.php
index b015f92..56e2590 100644
--- a/src/6992384f-4f29-489f-a52e-286e03f4593b/code.php
+++ b/src/6992384f-4f29-489f-a52e-286e03f4593b/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/6992384f-4f29-489f-a52e-286e03f4593b/settings.json b/src/6992384f-4f29-489f-a52e-286e03f4593b/settings.json
index ec52dc3..9ff4753 100644
--- a/src/6992384f-4f29-489f-a52e-286e03f4593b/settings.json
+++ b/src/6992384f-4f29-489f-a52e-286e03f4593b/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.HasMenuGlobal",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.HasMenuGlobal",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.HasMenuGlobal",
     "description": "Has Menu Global Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/69c29be3-ab25-4f56-944e-7ada6307b10c/README.md b/src/69c29be3-ab25-4f56-944e-7ada6307b10c/README.md
index 4261ceb..3b857b8 100644
--- a/src/69c29be3-ab25-4f56-944e-7ada6307b10c/README.md
+++ b/src/69c29be3-ab25-4f56-944e-7ada6307b10c/README.md
@@ -8,6 +8,7 @@
 ```
 # interface UpdateInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Interfaces\Database**
+> extends: ****
 ```uml
 @startuml
 interface UpdateInterface  #Lavender {
diff --git a/src/69c29be3-ab25-4f56-944e-7ada6307b10c/settings.json b/src/69c29be3-ab25-4f56-944e-7ada6307b10c/settings.json
index 4e457d8..af68b01 100644
--- a/src/69c29be3-ab25-4f56-944e-7ada6307b10c/settings.json
+++ b/src/69c29be3-ab25-4f56-944e-7ada6307b10c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "69c29be3-ab25-4f56-944e-7ada6307b10c",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Database.UpdateInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.Database.UpdateInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Interfaces.Database.UpdateInterface",
     "description": "Database Update\r\n\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/69d2b980-a665-48cd-96f8-757bf3810b41/README.md b/src/69d2b980-a665-48cd-96f8-757bf3810b41/README.md
index 9780615..a50539c 100644
--- a/src/69d2b980-a665-48cd-96f8-757bf3810b41/README.md
+++ b/src/69d2b980-a665-48cd-96f8-757bf3810b41/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Settings (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class Settings << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/69d2b980-a665-48cd-96f8-757bf3810b41/code.php b/src/69d2b980-a665-48cd-96f8-757bf3810b41/code.php
index 6298424..1feea90 100644
--- a/src/69d2b980-a665-48cd-96f8-757bf3810b41/code.php
+++ b/src/69d2b980-a665-48cd-96f8-757bf3810b41/code.php
@@ -21,9 +21,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Component;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Dynamicpath;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Pathfix;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component\SettingsInterface;
 
 
diff --git a/src/69d2b980-a665-48cd-96f8-757bf3810b41/settings.json b/src/69d2b980-a665-48cd-96f8-757bf3810b41/settings.json
index 7ee752a..472c999 100644
--- a/src/69d2b980-a665-48cd-96f8-757bf3810b41/settings.json
+++ b/src/69d2b980-a665-48cd-96f8-757bf3810b41/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "69d2b980-a665-48cd-96f8-757bf3810b41",
     "implements": [
         "5f44e66a-31d0-45ff-92b3-b7372dc57ae9"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.JoomlaFive.Settings",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.JoomlaFive.Settings",
     "description": "Compiler Component (Joomla Version) Settings\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6a1dddb3-a955-425e-b713-8ef81f256035/code.php b/src/6a1dddb3-a955-425e-b713-8ef81f256035/code.php
index 6423bbb..f569b53 100644
--- a/src/6a1dddb3-a955-425e-b713-8ef81f256035/code.php
+++ b/src/6a1dddb3-a955-425e-b713-8ef81f256035/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/6a1dddb3-a955-425e-b713-8ef81f256035/settings.json b/src/6a1dddb3-a955-425e-b713-8ef81f256035/settings.json
index a854882..bb96908 100644
--- a/src/6a1dddb3-a955-425e-b713-8ef81f256035/settings.json
+++ b/src/6a1dddb3-a955-425e-b713-8ef81f256035/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Title",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Title",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Title",
     "description": "Title Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/code.php b/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/code.php
index 7488853..97203c5 100644
--- a/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/code.php
+++ b/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\InArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\InArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/settings.json b/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/settings.json
index 204909a..8cdf5c6 100644
--- a/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/settings.json
+++ b/src/6b386f2e-3eb1-4f60-81af-a90c8da1ffeb/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.JsonItemArray",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.JsonItemArray",
     "description": "Json Item Array Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/README.md b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/README.md
index 51678c4..17301a8 100644
--- a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/README.md
+++ b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/README.md
@@ -8,6 +8,7 @@
 ```
 # class Folder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Folder  #Gold {
diff --git a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/code.php b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/code.php
index d79a16d..4313f08 100644
--- a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/code.php
+++ b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/code.php
@@ -17,7 +17,7 @@ use Joomla\CMS\Filesystem\File as JoomlaFile;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\File;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/settings.json b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/settings.json
index b278d1f..5206f2c 100644
--- a/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/settings.json
+++ b/src/6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6bbb6ffe-3f09-4c21-aa9d-c93159afa1e1",
     "implements": null,
     "load_selection": null,
@@ -27,6 +27,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Folder",
     "description": "Folder helper\r\n\r\n@since  3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    3rd September, 2020\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/README.md b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/README.md
index 5862b27..51977ea 100644
--- a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/README.md
+++ b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Structure << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/code.php b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/code.php
index 272159b..c07ccf9 100644
--- a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/code.php
+++ b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/code.php
@@ -16,7 +16,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component\SettingsInterface as Settings;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/settings.json b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/settings.json
index cc985ac..a6edd0c 100644
--- a/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/settings.json
+++ b/src/6c89c663-78f5-4078-9fac-7047f2eaaf96/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6c89c663-78f5-4078-9fac-7047f2eaaf96",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Structure",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Structure",
     "description": "Build\/Create Component Structure\r\n\r\n@since  3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6d179307-b6e5-4f50-962b-5b6360d0759e/README.md b/src/6d179307-b6e5-4f50-962b-5b6360d0759e/README.md
index 32a3b08..6ce1914 100644
--- a/src/6d179307-b6e5-4f50-962b-5b6360d0759e/README.md
+++ b/src/6d179307-b6e5-4f50-962b-5b6360d0759e/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AccessSectionsCategory (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class AccessSectionsCategory << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/6d179307-b6e5-4f50-962b-5b6360d0759e/settings.json b/src/6d179307-b6e5-4f50-962b-5b6360d0759e/settings.json
index 56018e9..d8f7136 100644
--- a/src/6d179307-b6e5-4f50-962b-5b6360d0759e/settings.json
+++ b/src/6d179307-b6e5-4f50-962b-5b6360d0759e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6d179307-b6e5-4f50-962b-5b6360d0759e",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.AccessSectionsCategory",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.AccessSectionsCategory",
     "description": "Access Sections Category Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/README.md b/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/README.md
index bcb1508..1d71820 100644
--- a/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/README.md
+++ b/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/README.md
@@ -8,6 +8,7 @@
 ```
 # interface ExtractorInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode**
+> extends: ****
 ```uml
 @startuml
 interface ExtractorInterface  #Lavender {
diff --git a/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/settings.json b/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/settings.json
index 19cd166..192c979 100644
--- a/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/settings.json
+++ b/src/6da2afa5-6087-46dd-80a0-74c6434bcb18/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6da2afa5-6087-46dd-80a0-74c6434bcb18",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Customcode.ExtractorInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Customcode.ExtractorInterface",
     "description": "Customcode Extractor Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/README.md b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/README.md
index a3ff461..de6b45a 100644
--- a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/README.md
+++ b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CustomFieldTypeFile (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class CustomFieldTypeFile << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/code.php b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/code.php
index b949537..0dae631 100644
--- a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/code.php
+++ b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/code.php
@@ -28,13 +28,13 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\FieldGroupControl;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ExtensionCustomFields;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HeaderInterface as Header;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface as CoreField;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
 
 
 /**
diff --git a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/settings.json b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/settings.json
index fbcdd14..70eb530 100644
--- a/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/settings.json
+++ b/src/6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6dced3d9-7d10-4ea1-bcf6-a5e6af4b9c96",
     "implements": null,
     "load_selection": null,
@@ -91,7 +91,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.CustomFieldTypeFile",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.CustomFieldTypeFile",
     "description": "Custom Field Type File Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Application\\CMSApplication;",
diff --git a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/README.md b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/README.md
index ec92ec5..57bed58 100644
--- a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/README.md
+++ b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/README.md
@@ -8,6 +8,7 @@
 ```
 # class Historyadminview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Historyadminview  #Gold {
diff --git a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/code.php b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/code.php
index cee726a..d85d087 100644
--- a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/code.php
+++ b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/code.php
@@ -16,7 +16,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HistoryInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Updatesql;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/settings.json b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/settings.json
index 8588010..1c353a8 100644
--- a/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/settings.json
+++ b/src/6dfbf568-f3cd-4ea7-af04-6859447b5462/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6dfbf568-f3cd-4ea7-af04-6859447b5462",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Historyadminview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Historyadminview",
     "description": "Model Admin View History Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6e64917c-d687-4ef3-a655-811319f5a81e/README.md b/src/6e64917c-d687-4ef3-a655-811319f5a81e/README.md
index 521714a..392d0d6 100644
--- a/src/6e64917c-d687-4ef3-a655-811319f5a81e/README.md
+++ b/src/6e64917c-d687-4ef3-a655-811319f5a81e/README.md
@@ -8,6 +8,7 @@
 ```
 # class Autoloader (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Autoloader  #Gold {
diff --git a/src/6e64917c-d687-4ef3-a655-811319f5a81e/code.php b/src/6e64917c-d687-4ef3-a655-811319f5a81e/code.php
index 03440f2..d0d96b6 100644
--- a/src/6e64917c-d687-4ef3-a655-811319f5a81e/code.php
+++ b/src/6e64917c-d687-4ef3-a655-811319f5a81e/code.php
@@ -17,7 +17,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ContentOne as Content;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/6e64917c-d687-4ef3-a655-811319f5a81e/settings.json b/src/6e64917c-d687-4ef3-a655-811319f5a81e/settings.json
index d756566..a7fc0a9 100644
--- a/src/6e64917c-d687-4ef3-a655-811319f5a81e/settings.json
+++ b/src/6e64917c-d687-4ef3-a655-811319f5a81e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "6e64917c-d687-4ef3-a655-811319f5a81e",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Autoloader",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Power.Autoloader",
     "description": "Compiler Autoloader\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/README.md b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/README.md
index b2b495a..01cd72f 100644
--- a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/README.md
+++ b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/README.md
@@ -8,29 +8,13 @@
 ```
 # abstract class Factory (Details)
 > namespace: **VDM\Joomla\Componentbuilder\JoomlaPower**
+> extends: **ExtendingFactory**
 ```uml
 @startuml
 abstract Factory  #Orange {
-  # static $container
-  + {static} _(string $key) : Mixed
-  + {static} getContainer() : Container
   # {static} createContainer() : Container
 }
 
-note right of Factory::_
-  Get any class from the package container
-
-  since: 3.2.0
-  return: Mixed
-end note
-
-note right of Factory::getContainer
-  Get the global package container
-
-  since: 3.2.0
-  return: Container
-end note
-
 note right of Factory::createContainer
   Create a container object
 
diff --git a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.php b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.php
index f39d2d4..fabd0f5 100644
--- a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.php
+++ b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.php
@@ -14,12 +14,14 @@ namespace VDM\Joomla\Componentbuilder\JoomlaPower;
 
 use Joomla\DI\Container;
 use VDM\Joomla\Componentbuilder\JoomlaPower\Service\JoomlaPower as Power;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Database;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Service\Database as PowerDatabase;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Gitea;
+use VDM\Joomla\Service\Database;
+use VDM\Joomla\Service\Model;
+use VDM\Joomla\Service\Data;
+use VDM\Joomla\Componentbuilder\Service\Gitea;
 use VDM\Joomla\Componentbuilder\Power\Service\Gitea as GiteaPower;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Utilities as GiteaUtilities;
-use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Gitea\Service\Utilities as GiteaUtilities;
+use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
 
 
 /**
@@ -27,45 +29,8 @@ use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
  * 
  * @since 3.2.0
  */
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
 {
-	/**
-	 * Global Package Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static $container = null;
-
-	/**
-	 * Get any class from the package container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  Mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
-	/**
-	 * Get the global package container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -77,7 +42,8 @@ abstract class Factory implements FactoryInterface
 		return (new Container())
 			->registerServiceProvider(new Power())
 			->registerServiceProvider(new Database())
-			->registerServiceProvider(new PowerDatabase())
+			->registerServiceProvider(new Model())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Gitea())
 			->registerServiceProvider(new GiteaPower())
 			->registerServiceProvider(new GiteaUtilities());
diff --git a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.power b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.power
index bf8a909..4e8a4b5 100644
--- a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.power
+++ b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/code.power
@@ -1,40 +1,3 @@
-	/**
-	 * Global Package Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static $container = null;
-
-	/**
-	 * Get any class from the package container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  Mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
-	/**
-	 * Get the global package container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -46,7 +9,8 @@
 		return (new Container())
 			->registerServiceProvider(new Power())
 			->registerServiceProvider(new Database())
-			->registerServiceProvider(new PowerDatabase())
+			->registerServiceProvider(new Model())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Gitea())
 			->registerServiceProvider(new GiteaPower())
 			->registerServiceProvider(new GiteaUtilities());
diff --git a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/settings.json b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/settings.json
index d740364..945ab09 100644
--- a/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/settings.json
+++ b/src/6ee3dc9e-1949-4da5-a74f-d9eb7f14e400/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "2e5bf608-de5c-4b00-a20d-47c26aa350d9",
     "guid": "6ee3dc9e-1949-4da5-a74f-d9eb7f14e400",
     "implements": [
         "caf33c5d-858c-4f9a-894f-ab302ec5445a"
@@ -21,23 +21,28 @@
             "as": "default"
         },
         "use_selection2": {
-            "use": "a2992a91-eec2-4957-811b-8cde22aa1438",
-            "as": "PowerDatabase"
+            "use": "2dcedd6c-c95b-4a37-9cac-95d28faedca3",
+            "as": "default"
         },
         "use_selection3": {
-            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "use": "a5daf189-3345-4b13-8716-c51f686f545b",
             "as": "default"
         },
         "use_selection4": {
+            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "as": "default"
+        },
+        "use_selection5": {
             "use": "510dc0f6-da3f-4a78-b43d-3a03e2cb5fae",
             "as": "GiteaPower"
         },
-        "use_selection5": {
+        "use_selection6": {
             "use": "6edf0cf3-c2b0-45c9-84d2-c6ef1c5d434c",
             "as": "GiteaUtilities"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Factory",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Factory",
     "description": "Joomla Power Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\DI\\Container;",
diff --git a/src/6f20369a-8536-4870-a1a3-cda254c939c8/code.php b/src/6f20369a-8536-4870-a1a3-cda254c939c8/code.php
index 0bafcd2..f4a7104 100644
--- a/src/6f20369a-8536-4870-a1a3-cda254c939c8/code.php
+++ b/src/6f20369a-8536-4870-a1a3-cda254c939c8/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Component;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/6f20369a-8536-4870-a1a3-cda254c939c8/settings.json b/src/6f20369a-8536-4870-a1a3-cda254c939c8/settings.json
index f38814b..f2fab1e 100644
--- a/src/6f20369a-8536-4870-a1a3-cda254c939c8/settings.json
+++ b/src/6f20369a-8536-4870-a1a3-cda254c939c8/settings.json
@@ -19,6 +19,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Paths",
     "description": "Compiler Utilities Paths\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/README.md b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/README.md
index 7e22702..c4c5b49 100644
--- a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/README.md
+++ b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Library**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/code.php b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/code.php
index c2f27ce..3cde60f 100644
--- a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/code.php
+++ b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/code.php
@@ -20,9 +20,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Data as FieldData;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Filesfolders;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/settings.json b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/settings.json
index 0e74a22..3460c09 100644
--- a/src/7175c1cd-2071-4cd7-b499-23881e168c3f/settings.json
+++ b/src/7175c1cd-2071-4cd7-b499-23881e168c3f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7175c1cd-2071-4cd7-b499-23881e168c3f",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Library.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Library.Data",
     "description": "Library Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/README.md b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/README.md
index 4417e35..04bc402 100644
--- a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/README.md
+++ b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/README.md
@@ -6,59 +6,76 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Database (Details)
+# class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Service**
+> extends: ****
 ```uml
 @startuml
-class Database  #Gold {
+class Data  #Gold {
   + register(Container $container) : void
   + getModelLoad(Container $container) : ModelLoad
   + getModelUpsert(Container $container) : ModelUpsert
-  + getLoadDatabase(Container $container) : LoadDatabase
-  + getInsertDatabase(Container $container) : InsertDatabase
-  + getUpdateDatabase(Container $container) : UpdateDatabase
+  + getLoadData(Container $container) : LoadData
+  + getInsertData(Container $container) : InsertData
+  + getUpdateData(Container $container) : UpdateData
+  + getDeleteData(Container $container) : DeleteData
+  + getItem(Container $container) : Item
 }
 
-note right of Database::register
+note right of Data::register
   Registers the service provider with a DI container.
 
   since: 3.2.0
   return: void
 end note
 
-note right of Database::getModelLoad
-  Get the Power Model Load
+note left of Data::getModelLoad
+  Get The Load Class.
 
   since: 3.2.0
   return: ModelLoad
 end note
 
-note right of Database::getModelUpsert
-  Get the Power Model Update or Insert
+note right of Data::getModelUpsert
+  Get The Upsert Class.
 
   since: 3.2.0
   return: ModelUpsert
 end note
 
-note right of Database::getLoadDatabase
-  Get the Load Database
+note left of Data::getLoadData
+  Get The Load Class.
 
   since: 3.2.0
-  return: LoadDatabase
+  return: LoadData
 end note
 
-note right of Database::getInsertDatabase
-  Get the Insert Database
+note right of Data::getInsertData
+  Get The Insert Class.
 
   since: 3.2.0
-  return: InsertDatabase
+  return: InsertData
 end note
 
-note right of Database::getUpdateDatabase
-  Get the Update Database
+note left of Data::getUpdateData
+  Get The Update Class.
 
   since: 3.2.0
-  return: UpdateDatabase
+  return: UpdateData
+end note
+
+note right of Data::getDeleteData
+  Get The Delete Class.
+
+  since: 3.2.2
+  return: DeleteData
+end note
+
+note left of Data::getItem
+  Get The Item Class.
+
+  since: 3.2.2
+  return: Item
 end note
  
 @enduml
diff --git a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.php b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.php
index 4b1a238..b96d310 100644
--- a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.php
+++ b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.php
@@ -14,19 +14,21 @@ namespace VDM\Joomla\Componentbuilder\Power\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use VDM\Joomla\Componentbuilder\Power\Model\Load as ModelLoad;
-use VDM\Joomla\Componentbuilder\Power\Model\Upsert as ModelUpsert;
-use VDM\Joomla\Componentbuilder\Power\Database\Load as LoadDatabase;
-use VDM\Joomla\Componentbuilder\Power\Database\Insert as InsertDatabase;
-use VDM\Joomla\Componentbuilder\Power\Database\Update as UpdateDatabase;
+use VDM\Joomla\Model\Load as ModelLoad;
+use VDM\Joomla\Model\Upsert as ModelUpsert;
+use VDM\Joomla\Componentbuilder\Power\Data\Load as LoadData;
+use VDM\Joomla\Componentbuilder\Power\Data\Insert as InsertData;
+use VDM\Joomla\Componentbuilder\Power\Data\Update as UpdateData;
+use VDM\Joomla\Componentbuilder\Power\Data\Delete as DeleteData;
+use VDM\Joomla\Data\Item;
 
 
 /**
- * Database Service Provider
+ * Data Service Provider
  * 
  * @since 3.2.0
  */
-class Database implements ServiceProviderInterface
+class Data implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -44,18 +46,24 @@ class Database implements ServiceProviderInterface
 		$container->alias(ModelUpsert::class, 'Power.Model.Upsert')
 			->share('Power.Model.Upsert', [$this, 'getModelUpsert'], true);
 
-		$container->alias(LoadDatabase::class, 'Power.Database.Load')
-			->share('Power.Database.Load', [$this, 'getLoadDatabase'], true);
+		$container->alias(LoadData::class, 'Power.Load')
+			->share('Power.Load', [$this, 'getLoadData'], true);
 
-		$container->alias(InsertDatabase::class, 'Power.Database.Insert')
-			->share('Power.Database.Insert', [$this, 'getInsertDatabase'], true);
+		$container->alias(InsertData::class, 'Power.Insert')
+			->share('Power.Insert', [$this, 'getInsertData'], true);
 
-		$container->alias(UpdateDatabase::class, 'Power.Database.Update')
-			->share('Power.Database.Update', [$this, 'getUpdateDatabase'], true);
+		$container->alias(UpdateData::class, 'Power.Update')
+			->share('Power.Update', [$this, 'getUpdateData'], true);
+
+		$container->alias(DeleteData::class, 'Power.Delete')
+			->share('Power.Delete', [$this, 'getDeleteData'], true);
+
+		$container->alias(Item::class, 'Power.Item')
+			->share('Power.Item', [$this, 'getItem'], true);
 	}
 
 	/**
-	 * Get the Power Model Load
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -65,12 +73,12 @@ class Database implements ServiceProviderInterface
 	public function getModelLoad(Container $container): ModelLoad
 	{
 		return new ModelLoad(
-			$container->get('Table')
+			$container->get('Table'), 'power', false
 		);
 	}
 
 	/**
-	 * Get the Power Model Update or Insert
+	 * Get The Upsert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -80,56 +88,89 @@ class Database implements ServiceProviderInterface
 	public function getModelUpsert(Container $container): ModelUpsert
 	{
 		return new ModelUpsert(
-			$container->get('Table')
+			$container->get('Table'), 'power', false
 		);
 	}
 
 	/**
-	 * Get the Load Database
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  LoadDatabase
+	 * @return  LoadData
 	 * @since 3.2.0
 	 */
-	public function getLoadDatabase(Container $container): LoadDatabase
+	public function getLoadData(Container $container): LoadData
 	{
-		return new LoadDatabase(
+		return new LoadData(
 			$container->get('Power.Model.Load'),
 			$container->get('Load')
 		);
 	}
 
 	/**
-	 * Get the Insert Database
+	 * Get The Insert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  InsertDatabase
+	 * @return  InsertData
 	 * @since 3.2.0
 	 */
-	public function getInsertDatabase(Container $container): InsertDatabase
+	public function getInsertData(Container $container): InsertData
 	{
-		return new InsertDatabase(
+		return new InsertData(
 			$container->get('Power.Model.Upsert'),
 			$container->get('Insert')
 		);
 	}
 
 	/**
-	 * Get the Update Database
+	 * Get The Update Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  UpdateDatabase
+	 * @return  UpdateData
 	 * @since 3.2.0
 	 */
-	public function getUpdateDatabase(Container $container): UpdateDatabase
+	public function getUpdateData(Container $container): UpdateData
 	{
-		return new UpdateDatabase(
+		return new UpdateData(
 			$container->get('Power.Model.Upsert'),
 			$container->get('Update')
 		);
+	}
+
+	/**
+	 * Get The Delete Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  DeleteData
+	 * @since 3.2.2
+	 */
+	public function getDeleteData(Container $container): DeleteData
+	{
+		return new DeleteData(
+			$container->get('Delete')
+		);
+	}
+
+	/**
+	 * Get The Item Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Item
+	 * @since 3.2.2
+	 */
+	public function getItem(Container $container): Item
+	{
+		return new Item(
+			$container->get('Power.Load'),
+			$container->get('Power.Insert'),
+			$container->get('Power.Update'),
+			$container->get('Power.Delete')
+		);
 	}
 }
 
diff --git a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.power b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.power
index c02fb62..b30d410 100644
--- a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.power
+++ b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/code.power
@@ -14,18 +14,24 @@
 		$container->alias(ModelUpsert::class, 'Power.Model.Upsert')
 			->share('Power.Model.Upsert', [$this, 'getModelUpsert'], true);
 
-		$container->alias(LoadDatabase::class, 'Power.Database.Load')
-			->share('Power.Database.Load', [$this, 'getLoadDatabase'], true);
+		$container->alias(LoadData::class, 'Power.Load')
+			->share('Power.Load', [$this, 'getLoadData'], true);
 
-		$container->alias(InsertDatabase::class, 'Power.Database.Insert')
-			->share('Power.Database.Insert', [$this, 'getInsertDatabase'], true);
+		$container->alias(InsertData::class, 'Power.Insert')
+			->share('Power.Insert', [$this, 'getInsertData'], true);
 
-		$container->alias(UpdateDatabase::class, 'Power.Database.Update')
-			->share('Power.Database.Update', [$this, 'getUpdateDatabase'], true);
+		$container->alias(UpdateData::class, 'Power.Update')
+			->share('Power.Update', [$this, 'getUpdateData'], true);
+
+		$container->alias(DeleteData::class, 'Power.Delete')
+			->share('Power.Delete', [$this, 'getDeleteData'], true);
+
+		$container->alias(Item::class, 'Power.Item')
+			->share('Power.Item', [$this, 'getItem'], true);
 	}
 
 	/**
-	 * Get the Power Model Load
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -35,12 +41,12 @@
 	public function getModelLoad(Container $container): ModelLoad
 	{
 		return new ModelLoad(
-			$container->get('Table')
+			$container->get('Table'), 'power', false
 		);
 	}
 
 	/**
-	 * Get the Power Model Update or Insert
+	 * Get The Upsert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -50,54 +56,87 @@
 	public function getModelUpsert(Container $container): ModelUpsert
 	{
 		return new ModelUpsert(
-			$container->get('Table')
+			$container->get('Table'), 'power', false
 		);
 	}
 
 	/**
-	 * Get the Load Database
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  LoadDatabase
+	 * @return  LoadData
 	 * @since 3.2.0
 	 */
-	public function getLoadDatabase(Container $container): LoadDatabase
+	public function getLoadData(Container $container): LoadData
 	{
-		return new LoadDatabase(
+		return new LoadData(
 			$container->get('Power.Model.Load'),
 			$container->get('Load')
 		);
 	}
 
 	/**
-	 * Get the Insert Database
+	 * Get The Insert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  InsertDatabase
+	 * @return  InsertData
 	 * @since 3.2.0
 	 */
-	public function getInsertDatabase(Container $container): InsertDatabase
+	public function getInsertData(Container $container): InsertData
 	{
-		return new InsertDatabase(
+		return new InsertData(
 			$container->get('Power.Model.Upsert'),
 			$container->get('Insert')
 		);
 	}
 
 	/**
-	 * Get the Update Database
+	 * Get The Update Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  UpdateDatabase
+	 * @return  UpdateData
 	 * @since 3.2.0
 	 */
-	public function getUpdateDatabase(Container $container): UpdateDatabase
+	public function getUpdateData(Container $container): UpdateData
 	{
-		return new UpdateDatabase(
+		return new UpdateData(
 			$container->get('Power.Model.Upsert'),
 			$container->get('Update')
 		);
+	}
+
+	/**
+	 * Get The Delete Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  DeleteData
+	 * @since 3.2.2
+	 */
+	public function getDeleteData(Container $container): DeleteData
+	{
+		return new DeleteData(
+			$container->get('Delete')
+		);
+	}
+
+	/**
+	 * Get The Item Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Item
+	 * @since 3.2.2
+	 */
+	public function getItem(Container $container): Item
+	{
+		return new Item(
+			$container->get('Power.Load'),
+			$container->get('Power.Insert'),
+			$container->get('Power.Update'),
+			$container->get('Power.Delete')
+		);
 	}
\ No newline at end of file
diff --git a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/settings.json b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/settings.json
index 1c48964..44b798f 100644
--- a/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/settings.json
+++ b/src/7243aaf6-b76c-4391-8698-50abbfc98fbe/settings.json
@@ -1,15 +1,15 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7243aaf6-b76c-4391-8698-50abbfc98fbe",
     "implements": [
         "-1"
     ],
     "load_selection": null,
-    "name": "Database",
+    "name": "Data",
     "power_version": "1.0.0",
-    "system_name": "JCB.Power.Service.Database",
+    "system_name": "JCB.Power.Service.Data",
     "type": "class",
     "use_selection": {
         "use_selection0": {
@@ -22,19 +22,28 @@
         },
         "use_selection2": {
             "use": "1f86db0f-e271-45df-8795-3e503ec76698",
-            "as": "LoadDatabase"
+            "as": "LoadData"
         },
         "use_selection3": {
             "use": "380bb7a3-cdcc-4336-a699-5070cbf521a5",
-            "as": "InsertDatabase"
+            "as": "InsertData"
         },
         "use_selection4": {
             "use": "e543c123-b1d9-4a0b-83b2-a9d371da5ff3",
-            "as": "UpdateDatabase"
+            "as": "UpdateData"
+        },
+        "use_selection5": {
+            "use": "4a4974f4-ac33-4d0f-9cc1-deb21b36d997",
+            "as": "DeleteData"
+        },
+        "use_selection6": {
+            "use": "9206082e-a3f7-472e-98b2-de90d06cbdcd",
+            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Service.Database",
-    "description": "Database Service Provider\r\n\r\n@since 3.2.0",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Service.Data",
+    "description": "Data Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\DI\\Container;\r\nuse Joomla\\DI\\ServiceProviderInterface;",
diff --git a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/README.md b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/README.md
index fdafbb0..80863cf 100644
--- a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/README.md
+++ b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InstallScript (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class InstallScript << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/code.php b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/code.php
index 8b4a0c0..6b24caf 100644
--- a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/code.php
+++ b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaFive;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Extension\InstallInterface;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\GetScriptInterface;
diff --git a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/settings.json b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/settings.json
index 3d6cf93..12a55f3 100644
--- a/src/73183d13-9b2e-4879-b05a-52298d5b31f7/settings.json
+++ b/src/73183d13-9b2e-4879-b05a-52298d5b31f7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "73183d13-9b2e-4879-b05a-52298d5b31f7",
     "implements": [
         "2e6731ba-3a03-4836-b2c2-4e50e38cb890"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaFive.InstallScript",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaFive.InstallScript",
     "description": "Loading the Extension Installation Script Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7415fdb4-5719-40b7-b01f-05588e968b47/code.php b/src/7415fdb4-5719-40b7-b01f-05588e968b47/code.php
index 3d77433..b6bf198 100644
--- a/src/7415fdb4-5719-40b7-b01f-05588e968b47/code.php
+++ b/src/7415fdb4-5719-40b7-b01f-05588e968b47/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/7415fdb4-5719-40b7-b01f-05588e968b47/settings.json b/src/7415fdb4-5719-40b7-b01f-05588e968b47/settings.json
index 27a3b6d..8bfb782 100644
--- a/src/7415fdb4-5719-40b7-b01f-05588e968b47/settings.json
+++ b/src/7415fdb4-5719-40b7-b01f-05588e968b47/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.LayoutData",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.LayoutData",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.LayoutData",
     "description": "Layout Data Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/74595661-236d-4aa1-99f3-358d093000be/code.php b/src/74595661-236d-4aa1-99f3-358d093000be/code.php
index 26c97c8..0eda016 100644
--- a/src/74595661-236d-4aa1-99f3-358d093000be/code.php
+++ b/src/74595661-236d-4aa1-99f3-358d093000be/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/74595661-236d-4aa1-99f3-358d093000be/settings.json b/src/74595661-236d-4aa1-99f3-358d093000be/settings.json
index 8a6a225..f5bebcd 100644
--- a/src/74595661-236d-4aa1-99f3-358d093000be/settings.json
+++ b/src/74595661-236d-4aa1-99f3-358d093000be/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherQuery",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherQuery",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherQuery",
     "description": "Other Query Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7506a35c-fa32-44ab-bd41-363439b20b82/code.php b/src/7506a35c-fa32-44ab-bd41-363439b20b82/code.php
index 5f6e2ac..bbe5cf9 100644
--- a/src/7506a35c-fa32-44ab-bd41-363439b20b82/code.php
+++ b/src/7506a35c-fa32-44ab-bd41-363439b20b82/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/7506a35c-fa32-44ab-bd41-363439b20b82/settings.json b/src/7506a35c-fa32-44ab-bd41-363439b20b82/settings.json
index a603861..9e87676 100644
--- a/src/7506a35c-fa32-44ab-bd41-363439b20b82/settings.json
+++ b/src/7506a35c-fa32-44ab-bd41-363439b20b82/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ListHeadOverride",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ListHeadOverride",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ListHeadOverride",
     "description": "List Head Override Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7526a39a-ada3-4499-8d75-81beff33f949/README.md b/src/7526a39a-ada3-4499-8d75-81beff33f949/README.md
new file mode 100644
index 0000000..a7ce49b
--- /dev/null
+++ b/src/7526a39a-ada3-4499-8d75-81beff33f949/README.md
@@ -0,0 +1,30 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# final class Languages (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Compiler\Builder**
+> extends: **Registry**
+```uml
+@startuml
+class Languages << (F,LightGreen) >> #RoyalBlue {
+}
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/7526a39a-ada3-4499-8d75-81beff33f949/code.php b/src/7526a39a-ada3-4499-8d75-81beff33f949/code.php
new file mode 100644
index 0000000..a03171f
--- /dev/null
+++ b/src/7526a39a-ada3-4499-8d75-81beff33f949/code.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
+
+
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
+
+
+/**
+ * Languages Builder Class
+ * 
+ * @since 3.2.2
+ */
+final class Languages extends Registry implements Registryinterface
+{
+	/**
+	 * Is an Array
+	 *
+	 * @since 3.2.2
+	 */
+	use IsArray;
+}
+
diff --git a/src/7526a39a-ada3-4499-8d75-81beff33f949/code.power b/src/7526a39a-ada3-4499-8d75-81beff33f949/code.power
new file mode 100644
index 0000000..2ba447f
--- /dev/null
+++ b/src/7526a39a-ada3-4499-8d75-81beff33f949/code.power
@@ -0,0 +1,6 @@
+	/**
+	 * Is an Array
+	 *
+	 * @since 3.2.2
+	 */
+	use IsArray;
\ No newline at end of file
diff --git a/src/7526a39a-ada3-4499-8d75-81beff33f949/settings.json b/src/7526a39a-ada3-4499-8d75-81beff33f949/settings.json
new file mode 100644
index 0000000..b078cd0
--- /dev/null
+++ b/src/7526a39a-ada3-4499-8d75-81beff33f949/settings.json
@@ -0,0 +1,26 @@
+{
+    "add_head": "0",
+    "add_licensing_template": "2",
+    "extends": "7e822c03-1b20-41d1-9427-f5b8d5836af7",
+    "guid": "7526a39a-ada3-4499-8d75-81beff33f949",
+    "implements": [
+        "64e291c2-11f1-423d-a44d-837cc12cc017"
+    ],
+    "load_selection": null,
+    "name": "Languages",
+    "power_version": "1.0.0",
+    "system_name": "JCB.Compiler.Builder.Languages",
+    "type": "final class",
+    "use_selection": {
+        "use_selection0": {
+            "use": "c09e8968-c767-4175-bb3d-8432f206a2c7",
+            "as": "default"
+        }
+    },
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Languages",
+    "description": "Languages Builder Class\r\n\r\n@since 3.2.2",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/763d137c-42bc-4282-98d8-cc5c0654985f/README.md b/src/763d137c-42bc-4282-98d8-cc5c0654985f/README.md
index f0ca487..0704129 100644
--- a/src/763d137c-42bc-4282-98d8-cc5c0654985f/README.md
+++ b/src/763d137c-42bc-4282-98d8-cc5c0654985f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Injector (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Injector  #Gold {
diff --git a/src/763d137c-42bc-4282-98d8-cc5c0654985f/settings.json b/src/763d137c-42bc-4282-98d8-cc5c0654985f/settings.json
index 5814d71..9bc99a8 100644
--- a/src/763d137c-42bc-4282-98d8-cc5c0654985f/settings.json
+++ b/src/763d137c-42bc-4282-98d8-cc5c0654985f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "763d137c-42bc-4282-98d8-cc5c0654985f",
     "implements": [
         "e923311a-4058-4e81-9f67-5956fd0c627c"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Injector",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Power.Injector",
     "description": "Compiler Power Injector\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/766a9524-37df-4604-91a7-b98a6150ee26/README.md b/src/766a9524-37df-4604-91a7-b98a6150ee26/README.md
index 9f90a93..f9dcc3d 100644
--- a/src/766a9524-37df-4604-91a7-b98a6150ee26/README.md
+++ b/src/766a9524-37df-4604-91a7-b98a6150ee26/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Joomlaplugin**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/766a9524-37df-4604-91a7-b98a6150ee26/code.php b/src/766a9524-37df-4604-91a7-b98a6150ee26/code.php
index 811980e..a328bd7 100644
--- a/src/766a9524-37df-4604-91a7-b98a6150ee26/code.php
+++ b/src/766a9524-37df-4604-91a7-b98a6150ee26/code.php
@@ -23,12 +23,12 @@ use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Field;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name as FieldName;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Filesfolders;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\PluginHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\String\PluginHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/766a9524-37df-4604-91a7-b98a6150ee26/settings.json b/src/766a9524-37df-4604-91a7-b98a6150ee26/settings.json
index 20d8fa3..c0aa7fc 100644
--- a/src/766a9524-37df-4604-91a7-b98a6150ee26/settings.json
+++ b/src/766a9524-37df-4604-91a7-b98a6150ee26/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "766a9524-37df-4604-91a7-b98a6150ee26",
     "implements": null,
     "load_selection": null,
@@ -71,7 +71,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Joomlaplugin.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Joomlaplugin.Data",
     "description": "Joomla Plugin Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Filter\\OutputFilter;",
diff --git a/src/77224dc6-8024-47eb-896e-18ec3aa23420/README.md b/src/77224dc6-8024-47eb-896e-18ec3aa23420/README.md
index 6da00ea..25cb3cd 100644
--- a/src/77224dc6-8024-47eb-896e-18ec3aa23420/README.md
+++ b/src/77224dc6-8024-47eb-896e-18ec3aa23420/README.md
@@ -8,6 +8,7 @@
 ```
 # class Event (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class Event  #Gold {
diff --git a/src/77224dc6-8024-47eb-896e-18ec3aa23420/code.php b/src/77224dc6-8024-47eb-896e-18ec3aa23420/code.php
index e67b268..f38ac5e 100644
--- a/src/77224dc6-8024-47eb-896e-18ec3aa23420/code.php
+++ b/src/77224dc6-8024-47eb-896e-18ec3aa23420/code.php
@@ -15,7 +15,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFive;
 use Joomla\CMS\Factory;
 use Joomla\Registry\Registry;
 use Joomla\CMS\Plugin\PluginHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\Component\Helper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\EventInterface;
 
 
diff --git a/src/77224dc6-8024-47eb-896e-18ec3aa23420/settings.json b/src/77224dc6-8024-47eb-896e-18ec3aa23420/settings.json
index d4666be..ff25fd7 100644
--- a/src/77224dc6-8024-47eb-896e-18ec3aa23420/settings.json
+++ b/src/77224dc6-8024-47eb-896e-18ec3aa23420/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "77224dc6-8024-47eb-896e-18ec3aa23420",
     "implements": [
         "20ed72b0-fcac-4344-aee1-8a65e3bf221d"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFive.Event",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFive.Event",
     "description": "Compiler Events\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\Registry\\Registry;\r\nuse Joomla\\CMS\\Plugin\\PluginHelper;",
diff --git a/src/79739667-72c6-4576-9830-7b1eb92e4791/README.md b/src/79739667-72c6-4576-9830-7b1eb92e4791/README.md
index 6ee9c0e..8ec7cdf 100644
--- a/src/79739667-72c6-4576-9830-7b1eb92e4791/README.md
+++ b/src/79739667-72c6-4576-9830-7b1eb92e4791/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldsetXML (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldsetXML << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/79739667-72c6-4576-9830-7b1eb92e4791/code.php b/src/79739667-72c6-4576-9830-7b1eb92e4791/code.php
index e3f8766..72eaaa8 100644
--- a/src/79739667-72c6-4576-9830-7b1eb92e4791/code.php
+++ b/src/79739667-72c6-4576-9830-7b1eb92e4791/code.php
@@ -25,7 +25,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Creator\Layout;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Xml;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldsetinterface;
 
 
diff --git a/src/79739667-72c6-4576-9830-7b1eb92e4791/settings.json b/src/79739667-72c6-4576-9830-7b1eb92e4791/settings.json
index 7809fcc..f8d3111 100644
--- a/src/79739667-72c6-4576-9830-7b1eb92e4791/settings.json
+++ b/src/79739667-72c6-4576-9830-7b1eb92e4791/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "79739667-72c6-4576-9830-7b1eb92e4791",
     "implements": [
         "d44f3294-6b68-4d85-a617-15fb772b7d14"
@@ -69,7 +69,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetXML",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetXML",
     "description": "Fieldset XML Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/README.md b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/README.md
index 3a8a421..b0d461a 100644
--- a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/README.md
+++ b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/README.md
@@ -8,6 +8,7 @@
 ```
 # class Dynamicget (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Dynamicget  #Gold {
diff --git a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/code.php b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/code.php
index fb67828..cf74f60 100644
--- a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/code.php
+++ b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/code.php
@@ -19,9 +19,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Dynamicget\Selection;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/settings.json b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/settings.json
index 5e009c0..f5414d7 100644
--- a/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/settings.json
+++ b/src/79740ee8-4d10-4b51-9ff5-18e1386ec1c6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "79740ee8-4d10-4b51-9ff5-18e1386ec1c6",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Dynamicget",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Dynamicget",
     "description": "Model Dynamic Get Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/797579e8-b272-41ed-91de-428cb0b3e089/README.md b/src/797579e8-b272-41ed-91de-428cb0b3e089/README.md
index bde132a..00f0aa6 100644
--- a/src/797579e8-b272-41ed-91de-428cb0b3e089/README.md
+++ b/src/797579e8-b272-41ed-91de-428cb0b3e089/README.md
@@ -8,6 +8,7 @@
 ```
 # class Hash (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class Hash  #Gold {
diff --git a/src/797579e8-b272-41ed-91de-428cb0b3e089/code.php b/src/797579e8-b272-41ed-91de-428cb0b3e089/code.php
index 788a815..e8a835c 100644
--- a/src/797579e8-b272-41ed-91de-428cb0b3e089/code.php
+++ b/src/797579e8-b272-41ed-91de-428cb0b3e089/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Customcode;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\FileHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 
diff --git a/src/797579e8-b272-41ed-91de-428cb0b3e089/settings.json b/src/797579e8-b272-41ed-91de-428cb0b3e089/settings.json
index a06fe54..3a73af4 100644
--- a/src/797579e8-b272-41ed-91de-428cb0b3e089/settings.json
+++ b/src/797579e8-b272-41ed-91de-428cb0b3e089/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "797579e8-b272-41ed-91de-428cb0b3e089",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.Hash",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.Hash",
     "description": "Compiler Custom Code MD5\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/README.md b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/README.md
index 1db566c..b81fd5c 100644
--- a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/README.md
+++ b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/README.md
@@ -8,6 +8,7 @@
 ```
 # abstract class FieldHelper (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 abstract FieldHelper  #Orange {
diff --git a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/code.php b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/code.php
index 1c0b06b..52f2176 100644
--- a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/code.php
+++ b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Base64Helper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\Base64Helper;
 
 
 /**
diff --git a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/settings.json b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/settings.json
index 696eded..0ddf2ad 100644
--- a/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/settings.json
+++ b/src/7a5fd3f3-199e-43ba-a8e8-f473d6c030ec/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7a5fd3f3-199e-43ba-a8e8-f473d6c030ec",
     "implements": null,
     "load_selection": null,
@@ -23,6 +23,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.FieldHelper",
     "description": "The Field Helper\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/README.md b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/README.md
index d848e58..e47eae8 100644
--- a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/README.md
+++ b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Header (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class Header << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/code.php b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/code.php
index 7ac4c83..b48b73b 100644
--- a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/code.php
+++ b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/code.php
@@ -22,8 +22,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\Category;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\AccessSwitchList;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Filter;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Tags;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HeaderInterface;
 
 
diff --git a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/settings.json b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/settings.json
index 5a17244..7e8072e 100644
--- a/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/settings.json
+++ b/src/7b56a097-9979-477b-b18a-c9dfc2f1e13b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7b56a097-9979-477b-b18a-c9dfc2f1e13b",
     "implements": [
         "3a777d70-52ad-49ec-9016-6f7438608613"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaThree.Header",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaThree.Header",
     "description": "Build headers for all Joomla 3 files\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/README.md b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/README.md
index 537d346..cb1466a 100644
--- a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/README.md
+++ b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/README.md
@@ -8,6 +8,7 @@
 ```
 # class LockBase (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class LockBase  #Gold {
diff --git a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/code.php b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/code.php
index 9efc076..7f490df 100644
--- a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/code.php
+++ b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Customcode;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
diff --git a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/settings.json b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/settings.json
index 5099a25..bf5e10a 100644
--- a/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/settings.json
+++ b/src/7c07c9d6-34cd-4491-934a-ef0a83f414c0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7c07c9d6-34cd-4491-934a-ef0a83f414c0",
     "implements": [
         "a3c515f5-4adf-4eb3-b637-0a1add550da6"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.LockBase",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.LockBase",
     "description": "Compiler Custom Code Base64\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php
index 41a3845..00eda6b 100644
--- a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php
+++ b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/code.php
@@ -12,11 +12,11 @@
 namespace VDM\Joomla\Componentbuilder\Power\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Model;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Interfaces\ModelInterface;
+use VDM\Joomla\Abstraction\Model;
 
 
 /**
diff --git a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json
index 0a5119a..052870c 100644
--- a/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json
+++ b/src/7c1fb50f-8fb1-4627-8705-6fedf7182ca5/settings.json
@@ -12,19 +12,20 @@
     "system_name": "JCB.Power.Model.Upsert",
     "type": "class",
     "use_selection": {
-        "use_selection1": {
+        "use_selection0": {
             "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
             "as": "default"
         },
-        "use_selection2": {
+        "use_selection1": {
             "use": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a",
             "as": "default"
         },
-        "use_selection3": {
+        "use_selection2": {
             "use": "91004529-94a9-4590-b842-e7c6b624ecf5",
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Power.Model.Upsert",
     "description": "Power Model Update or Insert\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/7f01622a-74c9-4e67-b111-3eb488035206/README.md b/src/7f01622a-74c9-4e67-b111-3eb488035206/README.md
index c87c787..6c8a12c 100644
--- a/src/7f01622a-74c9-4e67-b111-3eb488035206/README.md
+++ b/src/7f01622a-74c9-4e67-b111-3eb488035206/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Permission (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class Permission << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/7f01622a-74c9-4e67-b111-3eb488035206/code.php b/src/7f01622a-74c9-4e67-b111-3eb488035206/code.php
index 86d8230..1b00a6c 100644
--- a/src/7f01622a-74c9-4e67-b111-3eb488035206/code.php
+++ b/src/7f01622a-74c9-4e67-b111-3eb488035206/code.php
@@ -21,8 +21,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionGlobalAction;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionDashboard;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
 use VDM\Joomla\Componentbuilder\Compiler\Language;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/7f01622a-74c9-4e67-b111-3eb488035206/settings.json b/src/7f01622a-74c9-4e67-b111-3eb488035206/settings.json
index fb8837f..f903617 100644
--- a/src/7f01622a-74c9-4e67-b111-3eb488035206/settings.json
+++ b/src/7f01622a-74c9-4e67-b111-3eb488035206/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7f01622a-74c9-4e67-b111-3eb488035206",
     "implements": null,
     "load_selection": null,
@@ -55,7 +55,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.Permission",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.Permission",
     "description": "Permission Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/README.md b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/README.md
index 45e7713..1952cf2 100644
--- a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/README.md
+++ b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Attributes (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Attributes << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/code.php b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/code.php
index a3422c8..f0df3f1 100644
--- a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/code.php
+++ b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/code.php
@@ -20,11 +20,11 @@ use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Groups as FieldGroups;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\Base64Helper;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\Base64Helper;
+use VDM\Joomla\Utilities\String\FieldHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\FieldHelper as UtilitiesFieldHelper;
 
 
diff --git a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/settings.json b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/settings.json
index 2b59797..2526e0c 100644
--- a/src/7f515c18-d019-4d2d-9852-b2dc970985b3/settings.json
+++ b/src/7f515c18-d019-4d2d-9852-b2dc970985b3/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "7f515c18-d019-4d2d-9852-b2dc970985b3",
     "implements": null,
     "load_selection": null,
@@ -67,7 +67,8 @@
             "as": "UtilitiesFieldHelper"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Attributes",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Attributes",
     "description": "Compiler Field Attributes\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/81212121-ad5c-43c5-b046-f2650864f690/code.php b/src/81212121-ad5c-43c5-b046-f2650864f690/code.php
index c58421f..deed56b 100644
--- a/src/81212121-ad5c-43c5-b046-f2650864f690/code.php
+++ b/src/81212121-ad5c-43c5-b046-f2650864f690/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/81212121-ad5c-43c5-b046-f2650864f690/settings.json b/src/81212121-ad5c-43c5-b046-f2650864f690/settings.json
index af3a04e..c07b318 100644
--- a/src/81212121-ad5c-43c5-b046-f2650864f690/settings.json
+++ b/src/81212121-ad5c-43c5-b046-f2650864f690/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.AccessSwitchList",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.AccessSwitchList",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.AccessSwitchList",
     "description": "Access Switch List Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/README.md b/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/README.md
index 0bc185d..adf1c63 100644
--- a/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/README.md
+++ b/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/README.md
@@ -8,6 +8,7 @@
 ```
 # interface Cryptinterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface Cryptinterface  #Lavender {
diff --git a/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/settings.json b/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/settings.json
index 84d3722..03d51ed 100644
--- a/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/settings.json
+++ b/src/81de8f57-dd9c-4a17-964f-848cd4a0743b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "81de8f57-dd9c-4a17-964f-848cd4a0743b",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Cryptinterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.Cryptinterface",
     "description": "The Crypt Interface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/82505f3f-297f-4d75-a581-929ab3e93689/code.php b/src/82505f3f-297f-4d75-a581-929ab3e93689/code.php
index e207a26..71835a2 100644
--- a/src/82505f3f-297f-4d75-a581-929ab3e93689/code.php
+++ b/src/82505f3f-297f-4d75-a581-929ab3e93689/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaPower;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power\ExtractorInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Extractor as ExtendingExtractor;
 
diff --git a/src/82505f3f-297f-4d75-a581-929ab3e93689/settings.json b/src/82505f3f-297f-4d75-a581-929ab3e93689/settings.json
index ab56251..d044354 100644
--- a/src/82505f3f-297f-4d75-a581-929ab3e93689/settings.json
+++ b/src/82505f3f-297f-4d75-a581-929ab3e93689/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaPower.Extractor",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaPower.Extractor",
     "description": "Compiler Joomla Power Extractor\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/84c11075-570a-4907-9be0-9305e0fabe3c/README.md b/src/84c11075-570a-4907-9be0-9305e0fabe3c/README.md
index 70ada2f..8e1213a 100644
--- a/src/84c11075-570a-4907-9be0-9305e0fabe3c/README.md
+++ b/src/84c11075-570a-4907-9be0-9305e0fabe3c/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsUikit (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsUikit << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/84c11075-570a-4907-9be0-9305e0fabe3c/settings.json b/src/84c11075-570a-4907-9be0-9305e0fabe3c/settings.json
index f0d4e8c..8e5722c 100644
--- a/src/84c11075-570a-4907-9be0-9305e0fabe3c/settings.json
+++ b/src/84c11075-570a-4907-9be0-9305e0fabe3c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "84c11075-570a-4907-9be0-9305e0fabe3c",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsUikit",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsUikit",
     "description": "Config Fieldsets Uikit Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8561f1f6-96c7-4e54-8869-0132116d57ce/code.php b/src/8561f1f6-96c7-4e54-8869-0132116d57ce/code.php
index 88175eb..c1dc199 100644
--- a/src/8561f1f6-96c7-4e54-8869-0132116d57ce/code.php
+++ b/src/8561f1f6-96c7-4e54-8869-0132116d57ce/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/8561f1f6-96c7-4e54-8869-0132116d57ce/settings.json b/src/8561f1f6-96c7-4e54-8869-0132116d57ce/settings.json
index 8019948..5b86108 100644
--- a/src/8561f1f6-96c7-4e54-8869-0132116d57ce/settings.json
+++ b/src/8561f1f6-96c7-4e54-8869-0132116d57ce/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CheckBox",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CheckBox",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CheckBox",
     "description": "Check Box Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/code.php b/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/code.php
index 844d53f..fbdcafe 100644
--- a/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/code.php
+++ b/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/settings.json b/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/settings.json
index 98bf83f..be85da9 100644
--- a/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/settings.json
+++ b/src/8591f6db-dd3c-4a63-9b3f-574c0ec74ade/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.TemplateData",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.TemplateData",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.TemplateData",
     "description": "Template Data Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/README.md b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/README.md
new file mode 100644
index 0000000..36f6365
--- /dev/null
+++ b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/README.md
@@ -0,0 +1,32 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# final class Repository (Details)
+> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower**
+> extends: **ExtendingRepository**
+```uml
+@startuml
+class Repository << (F,LightGreen) >> #RoyalBlue {
+  # string $table
+  # array $map
+}
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.php b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.php
new file mode 100644
index 0000000..4ad6a75
--- /dev/null
+++ b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\JoomlaPower;
+
+
+use VDM\Joomla\Data\Repository as ExtendingRepository;
+
+
+/**
+ * Set JoomlaPower based on global unique ids to remote repository
+ * 
+ * @since 3.2.2
+ */
+final class Repository extends ExtendingRepository
+{
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.1
+	 */
+	protected string $table = 'joomla_power';
+
+	/**
+	 * The item map
+	 *
+	 * @var    array
+	 * @since 3.2.2
+	 */
+	protected array $map = [
+		'system_name' => 'system_name',
+		'settings' => 'settings',
+		'guid' => 'guid',
+		'description' => 'description'
+	];
+}
+
diff --git a/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.power b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.power
new file mode 100644
index 0000000..039c92e
--- /dev/null
+++ b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/code.power
@@ -0,0 +1,20 @@
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.1
+	 */
+	protected string $table = 'joomla_power';
+
+	/**
+	 * The item map
+	 *
+	 * @var    array
+	 * @since 3.2.2
+	 */
+	protected array $map = [
+		'system_name' => 'system_name',
+		'settings' => 'settings',
+		'guid' => 'guid',
+		'description' => 'description'
+	];
\ No newline at end of file
diff --git a/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/settings.json b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/settings.json
new file mode 100644
index 0000000..ec7e5a9
--- /dev/null
+++ b/src/85cddb24-7ee6-4d86-a0db-615f443e1aec/settings.json
@@ -0,0 +1,19 @@
+{
+    "add_head": "0",
+    "add_licensing_template": "2",
+    "extends": "eb7d69c2-4ee9-4bd0-aacc-ab51a12be895",
+    "guid": "85cddb24-7ee6-4d86-a0db-615f443e1aec",
+    "implements": null,
+    "load_selection": null,
+    "name": "Repository",
+    "power_version": "1.0.0",
+    "system_name": "JCB.JoomlaPower.Repository",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Repository",
+    "description": "Set JoomlaPower based on global unique ids to remote repository\r\n\r\n@since 3.2.2",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/README.md b/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/README.md
index d3f9b76..81704c2 100644
--- a/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/README.md
+++ b/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/README.md
@@ -8,6 +8,7 @@
 ```
 # interface Serverinterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface Serverinterface  #Lavender {
diff --git a/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/settings.json b/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/settings.json
index b1f070e..6be907e 100644
--- a/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/settings.json
+++ b/src/86ac0760-26f5-4746-9c7f-ce77860f80f8/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "86ac0760-26f5-4746-9c7f-ce77860f80f8",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Serverinterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.Serverinterface",
     "description": "The Core Server Interface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/code.php b/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/code.php
index a75125e..533a057 100644
--- a/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/code.php
+++ b/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/settings.json b/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/settings.json
index 1b3e9bc..da79ac7 100644
--- a/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/settings.json
+++ b/src/87d1da23-08d6-4fbf-bd0d-b746da240b8a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CustomField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CustomField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CustomField",
     "description": "Custom Field Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/README.md b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/README.md
index efd0701..ea6a3c3 100644
--- a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/README.md
+++ b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/README.md
@@ -8,6 +8,7 @@
 ```
 # final class History (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class History << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/code.php b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/code.php
index b3018cb..c94a427 100644
--- a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/code.php
+++ b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaThree;
 
 use Joomla\CMS\Factory;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HistoryInterface;
 
diff --git a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/settings.json b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/settings.json
index c21fd1d..a231838 100644
--- a/src/87db51b9-1126-4c21-858b-53dbd3a68b61/settings.json
+++ b/src/87db51b9-1126-4c21-858b-53dbd3a68b61/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "87db51b9-1126-4c21-858b-53dbd3a68b61",
     "implements": [
         "4325745f-da1f-4d4d-a591-3189fe8c06e5"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaThree.History",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaThree.History",
     "description": "Compiler History\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/README.md b/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/README.md
index 72c92bc..b45ae1f 100644
--- a/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/README.md
+++ b/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Customview  #Gold {
diff --git a/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/settings.json b/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/settings.json
index aa41822..c10b936 100644
--- a/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/settings.json
+++ b/src/87faa133-4cac-4816-ae41-5c3f9a2f76aa/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "87faa133-4cac-4816-ae41-5c3f9a2f76aa",
     "implements": [
         "-1"
@@ -25,6 +25,7 @@
             "as": "DynamicgetSelection"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Customview",
     "description": "Compiler Customview\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/README.md b/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/README.md
index a17f737..dcbac8a 100644
--- a/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/README.md
+++ b/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ServiceProviderBuilder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Generator**
+> extends: ****
 ```uml
 @startuml
 class ServiceProviderBuilder << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/settings.json b/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/settings.json
index fb72a3d..9b166dd 100644
--- a/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/settings.json
+++ b/src/8a2a3ee5-6ce2-4604-91e2-01f770228960/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8a2a3ee5-6ce2-4604-91e2-01f770228960",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.ServiceProviderBuilder",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.ServiceProviderBuilder",
     "description": "Power Service Provider Builder of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/README.md b/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/README.md
index 15329df..6c3cae0 100644
--- a/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/README.md
+++ b/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/README.md
@@ -8,6 +8,7 @@
 ```
 # class Component (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Component  #Gold {
diff --git a/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/settings.json b/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/settings.json
index f007023..ad66605 100644
--- a/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/settings.json
+++ b/src/8a63e87b-b39b-4a15-8044-9b2a2f4fb61c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8a63e87b-b39b-4a15-8044-9b2a2f4fb61c",
     "implements": [
         "-1"
@@ -57,6 +57,7 @@
             "as": "Settings"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Component",
     "description": "Component Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/README.md b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/README.md
index c0e8b63..b42f256 100644
--- a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/README.md
+++ b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/README.md
@@ -8,6 +8,7 @@
 ```
 # final class History (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class History << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/code.php b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/code.php
index 9af951f..1a0c2f8 100644
--- a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/code.php
+++ b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\JoomlaFive;
 
 use Joomla\CMS\Factory;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HistoryInterface;
 
diff --git a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/settings.json b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/settings.json
index beb86e7..6c57486 100644
--- a/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/settings.json
+++ b/src/8ab6fe75-ba5a-4316-9ef8-1eccceec813f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8ab6fe75-ba5a-4316-9ef8-1eccceec813f",
     "implements": [
         "4325745f-da1f-4d4d-a591-3189fe8c06e5"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFive.History",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFive.History",
     "description": "Compiler History\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/README.md b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/README.md
index 8d00fcc..19cb046 100644
--- a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/README.md
+++ b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreRule (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class CoreRule << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/code.php b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/code.php
index d056d04..9aee380 100644
--- a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/code.php
+++ b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFive;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface;
 
 
diff --git a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/settings.json b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/settings.json
index 69cd4c4..eeebd74 100644
--- a/src/8b56b62d-b960-4823-b9bb-c71675a71b85/settings.json
+++ b/src/8b56b62d-b960-4823-b9bb-c71675a71b85/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8b56b62d-b960-4823-b9bb-c71675a71b85",
     "implements": [
         "b9f05dc4-d23a-499a-a826-9749b81818ed"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.CoreRule",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFive.CoreRule",
     "description": "Core Joomla Field Rules\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/README.md b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/README.md
index 7543c71..32552e9 100644
--- a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/README.md
+++ b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CustomButtonPermissions (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class CustomButtonPermissions << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/code.php b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/code.php
index 15edfe6..5458913 100644
--- a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/code.php
+++ b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/code.php
@@ -16,8 +16,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\PermissionComponent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/settings.json b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/settings.json
index 8594ce0..cfde016 100644
--- a/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/settings.json
+++ b/src/8bf026e7-9ae0-423c-b74b-5bc16c54acf7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8bf026e7-9ae0-423c-b74b-5bc16c54acf7",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.CustomButtonPermissions",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.CustomButtonPermissions",
     "description": "Custom Button Permissions Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/README.md b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/README.md
index 477612e..4dc4258 100644
--- a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/README.md
+++ b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/README.md
@@ -8,6 +8,7 @@
 ```
 # class UniqueName (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class UniqueName  #Gold {
diff --git a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/code.php b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/code.php
index 2ffe34a..affe4c2 100644
--- a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/code.php
+++ b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
 
 
diff --git a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/settings.json b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/settings.json
index 3905c23..8fa82e7 100644
--- a/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/settings.json
+++ b/src/8c018533-e967-4bf2-9bd9-9e92966fcb5e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8c018533-e967-4bf2-9bd9-9e92966fcb5e",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.UniqueName",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.UniqueName",
     "description": "Compiler Field Unique Name\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/code.php b/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/code.php
index 50b1a9a..c18a00b 100644
--- a/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/code.php
+++ b/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/settings.json b/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/settings.json
index b9ae7f0..dc144a6 100644
--- a/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/settings.json
+++ b/src/8ca30d59-e56a-4cdd-bd8c-d9aad28f5903/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Tags",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Tags",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Tags",
     "description": "Tags Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8eee7df5-2775-41a9-9372-c46c5939a252/README.md b/src/8eee7df5-2775-41a9-9372-c46c5939a252/README.md
index f6cef12..b4679dc 100644
--- a/src/8eee7df5-2775-41a9-9372-c46c5939a252/README.md
+++ b/src/8eee7df5-2775-41a9-9372-c46c5939a252/README.md
@@ -8,6 +8,7 @@
 ```
 # class Language (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class Language  #Gold {
diff --git a/src/8eee7df5-2775-41a9-9372-c46c5939a252/code.php b/src/8eee7df5-2775-41a9-9372-c46c5939a252/code.php
index 24b26ff..73011bb 100644
--- a/src/8eee7df5-2775-41a9-9372-c46c5939a252/code.php
+++ b/src/8eee7df5-2775-41a9-9372-c46c5939a252/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\LanguageInterface;
diff --git a/src/8eee7df5-2775-41a9-9372-c46c5939a252/settings.json b/src/8eee7df5-2775-41a9-9372-c46c5939a252/settings.json
index 759e038..15a9fb2 100644
--- a/src/8eee7df5-2775-41a9-9372-c46c5939a252/settings.json
+++ b/src/8eee7df5-2775-41a9-9372-c46c5939a252/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8eee7df5-2775-41a9-9372-c46c5939a252",
     "implements": [
         "d6592c9b-93a6-41b3-83c7-c43a0a80cb83"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Language",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Language",
     "description": "Compiler Language Content\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/code.php b/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/code.php
index 5e56300..e2bc985 100644
--- a/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/code.php
+++ b/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/settings.json b/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/settings.json
index eccde04..0fc1b06 100644
--- a/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/settings.json
+++ b/src/8f46f85d-7921-44e9-a40e-dc4f01c5d43a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.GetAsLookup",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.GetAsLookup",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.GetAsLookup",
     "description": "Get As Lookup Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/README.md b/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/README.md
index 5fad958..5b5131c 100644
--- a/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/README.md
+++ b/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowEdit (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaThree\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowEdit << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/settings.json b/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/settings.json
index 54dc519..7d5421c 100644
--- a/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/settings.json
+++ b/src/8faaed82-522d-4f78-bd43-0ab3f7c72e5f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8faaed82-522d-4f78-bd43-0ab3f7c72e5f",
     "implements": [
         "992a842f-1ba9-4a5c-b214-042459ffe038"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Controller.AllowEdit",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Controller.AllowEdit",
     "description": "Controller Allow Edit Class for Joomla 3\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/README.md b/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/README.md
index 84cf2e4..d71c150 100644
--- a/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/README.md
+++ b/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/README.md
@@ -8,6 +8,7 @@
 ```
 # class Creator (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Creator  #Gold {
diff --git a/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/settings.json b/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/settings.json
index 25f83e7..d522255 100644
--- a/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/settings.json
+++ b/src/8fdd604f-53e7-4a91-9935-afcfd2f6ac1b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "8fdd604f-53e7-4a91-9935-afcfd2f6ac1b",
     "implements": [
         "-1"
@@ -145,7 +145,8 @@
             "as": "Fieldset"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Creator",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.Creator",
     "description": "Creator Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/code.php b/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/code.php
index d9ce853..40de3c5 100644
--- a/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/code.php
+++ b/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\InArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\InArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/settings.json b/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/settings.json
index 27cc334..46c7090 100644
--- a/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/settings.json
+++ b/src/9042fac6-5ca5-4ebe-94fe-cf9b0718ed36/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ScriptUserSwitch",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ScriptUserSwitch",
     "description": "Script User Switch Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/README.md b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/README.md
index 98a667c..8d3c3e4 100644
--- a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/README.md
+++ b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/README.md
@@ -8,6 +8,7 @@
 ```
 # class Modifieddate (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Modifieddate  #Gold {
diff --git a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/code.php b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/code.php
index 2fbee8c..fc30b2c 100644
--- a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/code.php
+++ b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/code.php
@@ -13,9 +13,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
 use Joomla\CMS\Factory;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/settings.json b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/settings.json
index 508501b..cd5405a 100644
--- a/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/settings.json
+++ b/src/9127e428-5dee-46cb-b3a9-ab5b91ea6df3/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "9127e428-5dee-46cb-b3a9-ab5b91ea6df3",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Modifieddate",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Modifieddate",
     "description": "Model - Get Modified Date\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/code.php b/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/code.php
index b52cce7..e22bb3f 100644
--- a/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/code.php
+++ b/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\JoomlaPower\Model;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface;
+use VDM\Joomla\Interfaces\ModelInterface;
 use VDM\Joomla\Componentbuilder\Power\Model\Upsert as ExtendingUpsert;
 
 
diff --git a/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/settings.json b/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/settings.json
index ec2efe3..99189ef 100644
--- a/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/settings.json
+++ b/src/9206082e-a3f7-472e-98b2-de90d06cbdcd/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.JoomlaPower.Model.Upsert",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Model.Upsert",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Model.Upsert",
     "description": "Joomla Power Model Update or Insert\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/README.md b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/README.md
index c938937..770b1bd 100644
--- a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/README.md
+++ b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Customtabs (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class Customtabs << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/code.php b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/code.php
index 78c62c3..3a70bea 100644
--- a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/code.php
+++ b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/code.php
@@ -17,9 +17,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\CustomTabs as BuilderCustomTabs
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Model\CustomtabsInterface;
 
diff --git a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/settings.json b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/settings.json
index a2cc06b..6eca601 100644
--- a/src/92cc3144-1d3d-45b2-b49f-c7d356950033/settings.json
+++ b/src/92cc3144-1d3d-45b2-b49f-c7d356950033/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "92cc3144-1d3d-45b2-b49f-c7d356950033",
     "implements": [
         "fcf42c53-0967-4c87-9699-a4d86adfdadf"
@@ -49,7 +49,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.JoomlaFive.Customtabs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.JoomlaFive.Customtabs",
     "description": "Model Custom Tabs Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9387215f-a965-4421-acf3-5e8f9d11382f/README.md b/src/9387215f-a965-4421-acf3-5e8f9d11382f/README.md
index 7ecc7cd..289aa60 100644
--- a/src/9387215f-a965-4421-acf3-5e8f9d11382f/README.md
+++ b/src/9387215f-a965-4421-acf3-5e8f9d11382f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Name (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Name  #Gold {
diff --git a/src/9387215f-a965-4421-acf3-5e8f9d11382f/code.php b/src/9387215f-a965-4421-acf3-5e8f9d11382f/code.php
index 20dc785..09e7f9f 100644
--- a/src/9387215f-a965-4421-acf3-5e8f9d11382f/code.php
+++ b/src/9387215f-a965-4421-acf3-5e8f9d11382f/code.php
@@ -12,11 +12,11 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\TypeHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\TypeHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Field\UniqueName;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\CategoryOtherName;
diff --git a/src/9387215f-a965-4421-acf3-5e8f9d11382f/settings.json b/src/9387215f-a965-4421-acf3-5e8f9d11382f/settings.json
index dba84f3..533a771 100644
--- a/src/9387215f-a965-4421-acf3-5e8f9d11382f/settings.json
+++ b/src/9387215f-a965-4421-acf3-5e8f9d11382f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "9387215f-a965-4421-acf3-5e8f9d11382f",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Name",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Name",
     "description": "Compiler Field Name\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9481caa2-6d04-4598-8320-543a93927243/code.php b/src/9481caa2-6d04-4598-8320-543a93927243/code.php
index c904018..c8fb86b 100644
--- a/src/9481caa2-6d04-4598-8320-543a93927243/code.php
+++ b/src/9481caa2-6d04-4598-8320-543a93927243/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9481caa2-6d04-4598-8320-543a93927243/settings.json b/src/9481caa2-6d04-4598-8320-543a93927243/settings.json
index 6f9644b..022a4fb 100644
--- a/src/9481caa2-6d04-4598-8320-543a93927243/settings.json
+++ b/src/9481caa2-6d04-4598-8320-543a93927243/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.AdminFilterType",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.AdminFilterType",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.AdminFilterType",
     "description": "Admin Filter Type Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/code.php b/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/code.php
index e1e3231..c13dbc1 100644
--- a/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/code.php
+++ b/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/settings.json b/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/settings.json
index 5e7114b..0ee6b78 100644
--- a/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/settings.json
+++ b/src/94e0beae-7daa-43b2-81b9-0bde390a76d8/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Sort",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Sort",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Sort",
     "description": "Sort Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/94f4939f-82cc-4196-802b-1346ce5c7f99/code.php b/src/94f4939f-82cc-4196-802b-1346ce5c7f99/code.php
index 44ff729..af8c837 100644
--- a/src/94f4939f-82cc-4196-802b-1346ce5c7f99/code.php
+++ b/src/94f4939f-82cc-4196-802b-1346ce5c7f99/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/94f4939f-82cc-4196-802b-1346ce5c7f99/settings.json b/src/94f4939f-82cc-4196-802b-1346ce5c7f99/settings.json
index 040328f..3334227 100644
--- a/src/94f4939f-82cc-4196-802b-1346ce5c7f99/settings.json
+++ b/src/94f4939f-82cc-4196-802b-1346ce5c7f99/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionComponent",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionComponent",
     "description": "Permission Component Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/952423ba-015a-4104-89a4-030695aa4d15/code.php b/src/952423ba-015a-4104-89a4-030695aa4d15/code.php
index 6e48f49..37135ac 100644
--- a/src/952423ba-015a-4104-89a4-030695aa4d15/code.php
+++ b/src/952423ba-015a-4104-89a4-030695aa4d15/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\ToString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\ToString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/952423ba-015a-4104-89a4-030695aa4d15/settings.json b/src/952423ba-015a-4104-89a4-030695aa4d15/settings.json
index b268e2e..f0d112a 100644
--- a/src/952423ba-015a-4104-89a4-030695aa4d15/settings.json
+++ b/src/952423ba-015a-4104-89a4-030695aa4d15/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.IntegerFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.IntegerFields",
     "description": "Integer Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9551b683-67b6-4367-bb14-4b016def37e3/code.php b/src/9551b683-67b6-4367-bb14-4b016def37e3/code.php
index 26b5a69..42f5c1d 100644
--- a/src/9551b683-67b6-4367-bb14-4b016def37e3/code.php
+++ b/src/9551b683-67b6-4367-bb14-4b016def37e3/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9551b683-67b6-4367-bb14-4b016def37e3/settings.json b/src/9551b683-67b6-4367-bb14-4b016def37e3/settings.json
index 3a2f577..5846f84 100644
--- a/src/9551b683-67b6-4367-bb14-4b016def37e3/settings.json
+++ b/src/9551b683-67b6-4367-bb14-4b016def37e3/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CustomTabs",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CustomTabs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CustomTabs",
     "description": "Custom Tabs Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/README.md b/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/README.md
index 801a32a..5698e26 100644
--- a/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/README.md
+++ b/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/README.md
@@ -8,6 +8,7 @@
 ```
 # interface InsertInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Interfaces\Database**
+> extends: ****
 ```uml
 @startuml
 interface InsertInterface  #Lavender {
diff --git a/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/settings.json b/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/settings.json
index 5718028..e66d48b 100644
--- a/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/settings.json
+++ b/src/95c02df3-fe0a-405b-b506-b7a5b8605b66/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "95c02df3-fe0a-405b-b506-b7a5b8605b66",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Database.InsertInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.Database.InsertInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Interfaces.Database.InsertInterface",
     "description": "Database Insert\r\n\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/README.md b/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/README.md
index d772ea5..be6bce9 100644
--- a/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/README.md
+++ b/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Parser (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Parser << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/settings.json b/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/settings.json
index 0591776..ab22cd2 100644
--- a/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/settings.json
+++ b/src/95d0e03f-24fd-4412-bc2e-f0899fcc3205/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "95d0e03f-24fd-4412-bc2e-f0899fcc3205",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Power.Parser",
     "type": "final class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Parser",
     "description": "Compiler Power Parser\r\n       Very basic php class methods parser, does not catch all edge-cases!\r\n       Use this only on code that are following standard good practices\r\n       Suggested improvements are welcome\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/95deb809-5f43-400b-939f-f9ceef720b13/README.md b/src/95deb809-5f43-400b-939f-f9ceef720b13/README.md
index 607a80a..3e24ed7 100644
--- a/src/95deb809-5f43-400b-939f-f9ceef720b13/README.md
+++ b/src/95deb809-5f43-400b-939f-f9ceef720b13/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Header (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\JoomlaFive**
+> extends: ****
 ```uml
 @startuml
 class Header << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/95deb809-5f43-400b-939f-f9ceef720b13/code.php b/src/95deb809-5f43-400b-939f-f9ceef720b13/code.php
index 944faa5..5db1071 100644
--- a/src/95deb809-5f43-400b-939f-f9ceef720b13/code.php
+++ b/src/95deb809-5f43-400b-939f-f9ceef720b13/code.php
@@ -22,8 +22,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\Category;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\AccessSwitchList;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Filter;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Tags;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\HeaderInterface;
 
 
diff --git a/src/95deb809-5f43-400b-939f-f9ceef720b13/settings.json b/src/95deb809-5f43-400b-939f-f9ceef720b13/settings.json
index 595d50a..28b6cfc 100644
--- a/src/95deb809-5f43-400b-939f-f9ceef720b13/settings.json
+++ b/src/95deb809-5f43-400b-939f-f9ceef720b13/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "95deb809-5f43-400b-939f-f9ceef720b13",
     "implements": [
         "3a777d70-52ad-49ec-9016-6f7438608613"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaFive.Header",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaFive.Header",
     "description": "Build headers for all Joomla 5 files\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/code.php b/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/code.php
index 8014020..e6032ef 100644
--- a/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/code.php
+++ b/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/settings.json b/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/settings.json
index 423277e..c648f6e 100644
--- a/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/settings.json
+++ b/src/961a2a2e-9f95-4b5f-b1c0-62ee783f9c66/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.FieldNames",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.FieldNames",
     "description": "Field Names Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/code.php b/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/code.php
index be4a628..b8a0ede 100644
--- a/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/code.php
+++ b/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/settings.json b/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/settings.json
index 3193df7..f6ccb9f 100644
--- a/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/settings.json
+++ b/src/972c4de9-6f6f-463b-8eea-cc7cbdb96aba/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ItemsMethodListString",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ItemsMethodListString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ItemsMethodListString",
     "description": "Items Method List String Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/97698747-c2ce-4e09-a470-acf6d8e86281/README.md b/src/97698747-c2ce-4e09-a470-acf6d8e86281/README.md
index 25c2e95..b920103 100644
--- a/src/97698747-c2ce-4e09-a470-acf6d8e86281/README.md
+++ b/src/97698747-c2ce-4e09-a470-acf6d8e86281/README.md
@@ -8,6 +8,7 @@
 ```
 # interface PlaceholderInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component**
+> extends: ****
 ```uml
 @startuml
 interface PlaceholderInterface  #Lavender {
diff --git a/src/97698747-c2ce-4e09-a470-acf6d8e86281/settings.json b/src/97698747-c2ce-4e09-a470-acf6d8e86281/settings.json
index 46a5de2..12a25af 100644
--- a/src/97698747-c2ce-4e09-a470-acf6d8e86281/settings.json
+++ b/src/97698747-c2ce-4e09-a470-acf6d8e86281/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "97698747-c2ce-4e09-a470-acf6d8e86281",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Component.PlaceholderInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Component.PlaceholderInterface",
     "description": "Component Placeholder Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php
index 989b1f1..0d4de7d 100644
--- a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php
+++ b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Abstraction;
 use Joomla\Registry\Registry as JoomlaRegistry;
 use Joomla\CMS\Factory;
 use Joomla\Input\Input;
-use VastDevelopmentMethod\Joomla\Utilities\Component\Helper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
-use VastDevelopmentMethod\Joomla\Abstraction\BaseConfig as ExtendingBaseConfig;
+use VDM\Joomla\Utilities\Component\Helper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Abstraction\BaseConfig as ExtendingBaseConfig;
 
 
 /**
diff --git a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json
index 6a4cabc..e977b99 100644
--- a/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json
+++ b/src/9769f3b2-17bf-4f20-b54b-3a4ebe572b36/settings.json
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Abstraction.BaseConfig",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Abstraction.BaseConfig",
     "description": "Config\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory;\r\nuse Joomla\\Input\\Input;",
diff --git a/src/98419ff3-6628-4539-8365-37f88378bced/code.php b/src/98419ff3-6628-4539-8365-37f88378bced/code.php
index 1ed1e98..3ee1100 100644
--- a/src/98419ff3-6628-4539-8365-37f88378bced/code.php
+++ b/src/98419ff3-6628-4539-8365-37f88378bced/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/98419ff3-6628-4539-8365-37f88378bced/settings.json b/src/98419ff3-6628-4539-8365-37f88378bced/settings.json
index 01778db..855be62 100644
--- a/src/98419ff3-6628-4539-8365-37f88378bced/settings.json
+++ b/src/98419ff3-6628-4539-8365-37f88378bced/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Request",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Request",
     "description": "Permission Strict Per Field Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/992a842f-1ba9-4a5c-b214-042459ffe038/README.md b/src/992a842f-1ba9-4a5c-b214-042459ffe038/README.md
index c13e64e..5e02969 100644
--- a/src/992a842f-1ba9-4a5c-b214-042459ffe038/README.md
+++ b/src/992a842f-1ba9-4a5c-b214-042459ffe038/README.md
@@ -8,6 +8,7 @@
 ```
 # interface AllowEditInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Architecture\Controller**
+> extends: ****
 ```uml
 @startuml
 interface AllowEditInterface  #Lavender {
diff --git a/src/992a842f-1ba9-4a5c-b214-042459ffe038/settings.json b/src/992a842f-1ba9-4a5c-b214-042459ffe038/settings.json
index 6f03738..ecaf5b9 100644
--- a/src/992a842f-1ba9-4a5c-b214-042459ffe038/settings.json
+++ b/src/992a842f-1ba9-4a5c-b214-042459ffe038/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "992a842f-1ba9-4a5c-b214-042459ffe038",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Architecture.Controller.AllowEdit",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Controller.AllowEditInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Controller.AllowEditInterface",
     "description": "Controller Allow Edit Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/README.md b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/README.md
index 110ca00..b55497d 100644
--- a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/README.md
+++ b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/README.md
@@ -8,6 +8,7 @@
 ```
 # class DatabaseName (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class DatabaseName  #Gold {
diff --git a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/code.php b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/code.php
index 3cebb4e..24acdd4 100644
--- a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/code.php
+++ b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Lists;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/settings.json b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/settings.json
index 47e8184..33b2707 100644
--- a/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/settings.json
+++ b/src/99368a6f-2f64-4d4e-ad3a-544d4020ecc6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "99368a6f-2f64-4d4e-ad3a-544d4020ecc6",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.DatabaseName",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.DatabaseName",
     "description": "Compiler Field Database Name\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/99786f53-64b7-4d52-95b0-5306e7386c3f/README.md b/src/99786f53-64b7-4d52-95b0-5306e7386c3f/README.md
index 998eb46..867b5c6 100644
--- a/src/99786f53-64b7-4d52-95b0-5306e7386c3f/README.md
+++ b/src/99786f53-64b7-4d52-95b0-5306e7386c3f/README.md
@@ -8,6 +8,7 @@
 ```
 # interface LoadInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Database**
+> extends: ****
 ```uml
 @startuml
 interface LoadInterface  #Lavender {
diff --git a/src/99786f53-64b7-4d52-95b0-5306e7386c3f/settings.json b/src/99786f53-64b7-4d52-95b0-5306e7386c3f/settings.json
index 5344cd3..0f14016 100644
--- a/src/99786f53-64b7-4d52-95b0-5306e7386c3f/settings.json
+++ b/src/99786f53-64b7-4d52-95b0-5306e7386c3f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "99786f53-64b7-4d52-95b0-5306e7386c3f",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Database.LoadInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Database.LoadInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Database.LoadInterface",
     "description": "Power Database Load\r\n\r\n@since 2.0.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/code.php b/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/code.php
index 8e59060..0d24e09 100644
--- a/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/code.php
+++ b/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/settings.json b/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/settings.json
index 337accc..ca81d19 100644
--- a/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/settings.json
+++ b/src/9b5872d6-c1d8-4602-b443-5844d2c950ee/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.AssetsRules",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.AssetsRules",
     "description": "Assets Rules Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/README.md b/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/README.md
index a3a62d7..eb75c01 100644
--- a/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/README.md
+++ b/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ClassInjectorBuilder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Generator**
+> extends: ****
 ```uml
 @startuml
 class ClassInjectorBuilder << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/settings.json b/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/settings.json
index af969e1..cc04242 100644
--- a/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/settings.json
+++ b/src/9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "9c2fdd98-ce4e-4b97-a2f8-ee6990bdcbf7",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.ClassInjectorBuilder",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.ClassInjectorBuilder",
     "description": "Power Class Injector Builder of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/code.php b/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/code.php
index 5dc7958..0476f83 100644
--- a/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/code.php
+++ b/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/settings.json b/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/settings.json
index f8f3171..fd5694f 100644
--- a/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/settings.json
+++ b/src/9cdff2af-bd1b-452f-810e-d034b9720d2a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.MovedPublishingFields",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.MovedPublishingFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.MovedPublishingFields",
     "description": "Moved Publishing Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/code.php b/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/code.php
index 65fe519..103b5a1 100644
--- a/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/code.php
+++ b/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/settings.json b/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/settings.json
index 63b2d77..6f7073c 100644
--- a/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/settings.json
+++ b/src/9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherFilter",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherFilter",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherFilter",
     "description": "Other Filter Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/README.md b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/README.md
index 4c90455..e0be29a 100644
--- a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/README.md
+++ b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/README.md
@@ -7,7 +7,7 @@
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
 # final class Insert (Details)
-> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Database**
+> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Data**
 > extends: **ExtendingInsert**
 ```uml
 @startuml
diff --git a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.php b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.php
index 87270fc..e637d71 100644
--- a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.php
+++ b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.php
@@ -9,17 +9,17 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\JoomlaPower\Database;
+namespace VDM\Joomla\Componentbuilder\JoomlaPower\Data;
 
 
-use VDM\Joomla\Componentbuilder\Interfaces\Database\InsertInterface;
-use VDM\Joomla\Componentbuilder\Power\Database\Insert as ExtendingInsert;
+use VDM\Joomla\Interfaces\Data\InsertInterface;
+use VDM\Joomla\Abstraction\Data\Insert as ExtendingInsert;
 
 
 /**
- * Joomla Power Database Insert
+ * Joomla Power Data Insert
  * 
- * @since 3.2.1
+ * @since 3.2.2
  */
 final class Insert extends ExtendingInsert implements InsertInterface
 {
@@ -29,6 +29,6 @@ final class Insert extends ExtendingInsert implements InsertInterface
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
+	protected string $table = 'joomla_power';
 }
 
diff --git a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.power b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.power
index e2209eb..1d2fc75 100644
--- a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.power
+++ b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/code.power
@@ -4,4 +4,4 @@
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
\ No newline at end of file
+	protected string $table = 'joomla_power';
\ No newline at end of file
diff --git a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/settings.json b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/settings.json
index e8cca6e..a4c055f 100644
--- a/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/settings.json
+++ b/src/9d53d45e-9b4d-45ec-827b-4916b91c907e/settings.json
@@ -1,19 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "380bb7a3-cdcc-4336-a699-5070cbf521a5",
+    "extends": "a455d916-cfe4-41df-9245-bafb709aacdb",
     "guid": "9d53d45e-9b4d-45ec-827b-4916b91c907e",
     "implements": [
-        "95c02df3-fe0a-405b-b506-b7a5b8605b66"
+        "03bbc8d5-86e8-4d2f-ae5f-0d44a4f7af13"
     ],
     "load_selection": null,
     "name": "Insert",
     "power_version": "1.0.0",
-    "system_name": "JCB.JoomlaPower.Database.Insert",
+    "system_name": "JCB.JoomlaPower.Data.Insert",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Database.Insert",
-    "description": "Joomla Power Database Insert\r\n\r\n@since 3.2.1",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Data.Insert",
+    "description": "Joomla Power Data Insert\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/code.php b/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/code.php
index 4f3884d..f71dd6c 100644
--- a/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/code.php
+++ b/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/settings.json b/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/settings.json
index 87768b8..5453d69 100644
--- a/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/settings.json
+++ b/src/9d74d613-5ef7-4cf1-9f12-64f0a8e19806/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CustomAlias",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CustomAlias",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CustomAlias",
     "description": "Custom Alias Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/README.md b/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/README.md
index 85209ed..bb74050 100644
--- a/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/README.md
+++ b/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/README.md
@@ -8,6 +8,7 @@
 ```
 # class Joomlaplugin (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Joomlaplugin  #Gold {
diff --git a/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/settings.json b/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/settings.json
index 8967a09..d23f0fc 100644
--- a/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/settings.json
+++ b/src/9eba241c-af90-42dd-ae05-92ff4d8391d3/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "9eba241c-af90-42dd-ae05-92ff4d8391d3",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Joomlaplugin",
     "description": "Joomla Plugin Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/README.md b/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/README.md
index f1974db..498cf09 100644
--- a/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/README.md
+++ b/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/README.md
@@ -8,6 +8,7 @@
 ```
 # class Language (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Language  #Gold {
diff --git a/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/settings.json b/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/settings.json
index 258d797..150cc43 100644
--- a/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/settings.json
+++ b/src/9f00e793-86f8-4ef9-b775-a3eb129f83c0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "9f00e793-86f8-4ef9-b775-a3eb129f83c0",
     "implements": [
         "-1"
@@ -25,6 +25,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Language",
     "description": "Compiler Language Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/code.php b/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/code.php
index 05352e3..482c36c 100644
--- a/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/code.php
+++ b/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/settings.json b/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/settings.json
index 21db0f6..85a0548 100644
--- a/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/settings.json
+++ b/src/9ff6d6cd-afea-4f15-a67b-fd132d386989/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.MysqlTableSetting",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.MysqlTableSetting",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.MysqlTableSetting",
     "description": "Mysql Table Setting Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/code.php b/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/code.php
index 1f2d160..89dd20a 100644
--- a/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/code.php
+++ b/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/settings.json b/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/settings.json
index 401e5e2..eb682a0 100644
--- a/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/settings.json
+++ b/src/a090a472-eb3d-4086-a6d5-4215e1b1851f/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.FieldRelations",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.FieldRelations",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.FieldRelations",
     "description": "Field Relations Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/README.md b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/README.md
index 9cba0a8..37b4715 100644
--- a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/README.md
+++ b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Layout (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class Layout << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/code.php b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/code.php
index 98a86cb..77047ed 100644
--- a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/code.php
+++ b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/code.php
@@ -18,7 +18,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\TabCounter;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Layout as BuilderLayout;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\MovedPublishingFields;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\NewPublishingFields;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/settings.json b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/settings.json
index b4b9686..4b3655b 100644
--- a/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/settings.json
+++ b/src/a0f032db-2242-41df-8e4a-5e9e6f88201d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a0f032db-2242-41df-8e4a-5e9e6f88201d",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.Layout",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.Layout",
     "description": "Layout Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/code.php b/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/code.php
index 16349dd..833141e 100644
--- a/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/code.php
+++ b/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/settings.json b/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/settings.json
index 6003766..60beb73 100644
--- a/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/settings.json
+++ b/src/a1e551a9-8369-48c9-a076-4e5beb65e0df/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.CategoryOtherName",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CategoryOtherName",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CategoryOtherName",
     "description": "Category Other Name Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a2992a91-eec2-4957-811b-8cde22aa1438/README.md b/src/a2992a91-eec2-4957-811b-8cde22aa1438/README.md
index a08063d..c4643d4 100644
--- a/src/a2992a91-eec2-4957-811b-8cde22aa1438/README.md
+++ b/src/a2992a91-eec2-4957-811b-8cde22aa1438/README.md
@@ -6,59 +6,76 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Database (Details)
+# class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Service**
+> extends: ****
 ```uml
 @startuml
-class Database  #Gold {
+class Data  #Gold {
   + register(Container $container) : void
   + getModelLoad(Container $container) : ModelLoad
   + getModelUpsert(Container $container) : ModelUpsert
-  + getLoadDatabase(Container $container) : LoadDatabase
-  + getInsertDatabase(Container $container) : InsertDatabase
-  + getUpdateDatabase(Container $container) : UpdateDatabase
+  + getLoadData(Container $container) : LoadData
+  + getInsertData(Container $container) : InsertData
+  + getUpdateData(Container $container) : UpdateData
+  + getDeleteData(Container $container) : DeleteData
+  + getItem(Container $container) : Item
 }
 
-note right of Database::register
+note right of Data::register
   Registers the service provider with a DI container.
 
   since: 3.2.0
   return: void
 end note
 
-note right of Database::getModelLoad
-  Get the Power Model Load
+note left of Data::getModelLoad
+  Get The Load Class.
 
   since: 3.2.0
   return: ModelLoad
 end note
 
-note right of Database::getModelUpsert
-  Get the Power Model Update or Insert
+note right of Data::getModelUpsert
+  Get The Upsert Class.
 
   since: 3.2.0
   return: ModelUpsert
 end note
 
-note right of Database::getLoadDatabase
-  Get the Load Database
+note left of Data::getLoadData
+  Get The Load Class.
 
   since: 3.2.0
-  return: LoadDatabase
+  return: LoadData
 end note
 
-note right of Database::getInsertDatabase
-  Get the Insert Database
+note right of Data::getInsertData
+  Get The Insert Class.
 
   since: 3.2.0
-  return: InsertDatabase
+  return: InsertData
 end note
 
-note right of Database::getUpdateDatabase
-  Get the Update Database
+note left of Data::getUpdateData
+  Get The Update Class.
 
   since: 3.2.0
-  return: UpdateDatabase
+  return: UpdateData
+end note
+
+note right of Data::getDeleteData
+  Get The Delete Class.
+
+  since: 3.2.0
+  return: DeleteData
+end note
+
+note left of Data::getItem
+  Get The Item Class.
+
+  since: 3.2.0
+  return: Item
 end note
  
 @enduml
diff --git a/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.php b/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.php
index 06524ad..e047105 100644
--- a/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.php
+++ b/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.php
@@ -14,19 +14,21 @@ namespace VDM\Joomla\Componentbuilder\JoomlaPower\Service;
 
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Model\Load as ModelLoad;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Model\Upsert as ModelUpsert;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Database\Load as LoadDatabase;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Database\Insert as InsertDatabase;
-use VDM\Joomla\Componentbuilder\JoomlaPower\Database\Update as UpdateDatabase;
+use VDM\Joomla\Model\Load as ModelLoad;
+use VDM\Joomla\Model\Upsert as ModelUpsert;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Data\Load as LoadData;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Data\Insert as InsertData;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Data\Update as UpdateData;
+use VDM\Joomla\Componentbuilder\JoomlaPower\Data\Delete as DeleteData;
+use VDM\Joomla\Data\Item;
 
 
 /**
- * Database Service Provider
+ * Data Service Provider
  * 
  * @since 3.2.0
  */
-class Database implements ServiceProviderInterface
+class Data implements ServiceProviderInterface
 {
 	/**
 	 * Registers the service provider with a DI container.
@@ -44,18 +46,24 @@ class Database implements ServiceProviderInterface
 		$container->alias(ModelUpsert::class, 'Joomla.Power.Model.Upsert')
 			->share('Joomla.Power.Model.Upsert', [$this, 'getModelUpsert'], true);
 
-		$container->alias(LoadDatabase::class, 'Joomla.Power.Database.Load')
-			->share('Joomla.Power.Database.Load', [$this, 'getLoadDatabase'], true);
+		$container->alias(LoadData::class, 'Joomla.Power.Load')
+			->share('Joomla.Power.Load', [$this, 'getLoadData'], true);
 
-		$container->alias(InsertDatabase::class, 'Joomla.Power.Database.Insert')
-			->share('Joomla.Power.Database.Insert', [$this, 'getInsertDatabase'], true);
+		$container->alias(InsertData::class, 'Joomla.Power.Insert')
+			->share('Joomla.Power.Insert', [$this, 'getInsertData'], true);
 
-		$container->alias(UpdateDatabase::class, 'Joomla.Power.Database.Update')
-			->share('Joomla.Power.Database.Update', [$this, 'getUpdateDatabase'], true);
+		$container->alias(UpdateData::class, 'Joomla.Power.Update')
+			->share('Joomla.Power.Update', [$this, 'getUpdateData'], true);
+
+		$container->alias(DeleteData::class, 'Joomla.Power.Delete')
+			->share('Joomla.Power.Delete', [$this, 'getDeleteData'], true);
+
+		$container->alias(Item::class, 'Joomla.Power.Item')
+			->share('Joomla.Power.Item', [$this, 'getItem'], true);
 	}
 
 	/**
-	 * Get the Power Model Load
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -65,12 +73,12 @@ class Database implements ServiceProviderInterface
 	public function getModelLoad(Container $container): ModelLoad
 	{
 		return new ModelLoad(
-			$container->get('Table')
+			$container->get('Table'), 'joomla_power', false
 		);
 	}
 
 	/**
-	 * Get the Power Model Update or Insert
+	 * Get The Upsert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -80,56 +88,89 @@ class Database implements ServiceProviderInterface
 	public function getModelUpsert(Container $container): ModelUpsert
 	{
 		return new ModelUpsert(
-			$container->get('Table')
+			$container->get('Table'), 'joomla_power', false
 		);
 	}
 
 	/**
-	 * Get the Load Database
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  LoadDatabase
+	 * @return  LoadData
 	 * @since 3.2.0
 	 */
-	public function getLoadDatabase(Container $container): LoadDatabase
+	public function getLoadData(Container $container): LoadData
 	{
-		return new LoadDatabase(
+		return new LoadData(
 			$container->get('Joomla.Power.Model.Load'),
 			$container->get('Load')
 		);
 	}
 
 	/**
-	 * Get the Insert Database
+	 * Get The Insert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  InsertDatabase
+	 * @return  InsertData
 	 * @since 3.2.0
 	 */
-	public function getInsertDatabase(Container $container): InsertDatabase
+	public function getInsertData(Container $container): InsertData
 	{
-		return new InsertDatabase(
+		return new InsertData(
 			$container->get('Joomla.Power.Model.Upsert'),
 			$container->get('Insert')
 		);
 	}
 
 	/**
-	 * Get the Update Database
+	 * Get The Update Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  UpdateDatabase
+	 * @return  UpdateData
 	 * @since 3.2.0
 	 */
-	public function getUpdateDatabase(Container $container): UpdateDatabase
+	public function getUpdateData(Container $container): UpdateData
 	{
-		return new UpdateDatabase(
+		return new UpdateData(
 			$container->get('Joomla.Power.Model.Upsert'),
 			$container->get('Update')
 		);
+	}
+
+	/**
+	 * Get The Delete Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  DeleteData
+	 * @since 3.2.0
+	 */
+	public function getDeleteData(Container $container): DeleteData
+	{
+		return new DeleteData(
+			$container->get('Update')
+		);
+	}
+
+	/**
+	 * Get The Item Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Item
+	 * @since 3.2.0
+	 */
+	public function getItem(Container $container): Item
+	{
+		return new Item(
+			$container->get('Joomla.Power.Load'),
+			$container->get('Joomla.Power.Insert'),
+			$container->get('Joomla.Power.Update'),
+			$container->get('Joomla.Power.Delete')
+		);
 	}
 }
 
diff --git a/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.power b/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.power
index 8a34d8d..1444991 100644
--- a/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.power
+++ b/src/a2992a91-eec2-4957-811b-8cde22aa1438/code.power
@@ -14,18 +14,24 @@
 		$container->alias(ModelUpsert::class, 'Joomla.Power.Model.Upsert')
 			->share('Joomla.Power.Model.Upsert', [$this, 'getModelUpsert'], true);
 
-		$container->alias(LoadDatabase::class, 'Joomla.Power.Database.Load')
-			->share('Joomla.Power.Database.Load', [$this, 'getLoadDatabase'], true);
+		$container->alias(LoadData::class, 'Joomla.Power.Load')
+			->share('Joomla.Power.Load', [$this, 'getLoadData'], true);
 
-		$container->alias(InsertDatabase::class, 'Joomla.Power.Database.Insert')
-			->share('Joomla.Power.Database.Insert', [$this, 'getInsertDatabase'], true);
+		$container->alias(InsertData::class, 'Joomla.Power.Insert')
+			->share('Joomla.Power.Insert', [$this, 'getInsertData'], true);
 
-		$container->alias(UpdateDatabase::class, 'Joomla.Power.Database.Update')
-			->share('Joomla.Power.Database.Update', [$this, 'getUpdateDatabase'], true);
+		$container->alias(UpdateData::class, 'Joomla.Power.Update')
+			->share('Joomla.Power.Update', [$this, 'getUpdateData'], true);
+
+		$container->alias(DeleteData::class, 'Joomla.Power.Delete')
+			->share('Joomla.Power.Delete', [$this, 'getDeleteData'], true);
+
+		$container->alias(Item::class, 'Joomla.Power.Item')
+			->share('Joomla.Power.Item', [$this, 'getItem'], true);
 	}
 
 	/**
-	 * Get the Power Model Load
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -35,12 +41,12 @@
 	public function getModelLoad(Container $container): ModelLoad
 	{
 		return new ModelLoad(
-			$container->get('Table')
+			$container->get('Table'), 'joomla_power', false
 		);
 	}
 
 	/**
-	 * Get the Power Model Update or Insert
+	 * Get The Upsert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -50,54 +56,87 @@
 	public function getModelUpsert(Container $container): ModelUpsert
 	{
 		return new ModelUpsert(
-			$container->get('Table')
+			$container->get('Table'), 'joomla_power', false
 		);
 	}
 
 	/**
-	 * Get the Load Database
+	 * Get The Load Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  LoadDatabase
+	 * @return  LoadData
 	 * @since 3.2.0
 	 */
-	public function getLoadDatabase(Container $container): LoadDatabase
+	public function getLoadData(Container $container): LoadData
 	{
-		return new LoadDatabase(
+		return new LoadData(
 			$container->get('Joomla.Power.Model.Load'),
 			$container->get('Load')
 		);
 	}
 
 	/**
-	 * Get the Insert Database
+	 * Get The Insert Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  InsertDatabase
+	 * @return  InsertData
 	 * @since 3.2.0
 	 */
-	public function getInsertDatabase(Container $container): InsertDatabase
+	public function getInsertData(Container $container): InsertData
 	{
-		return new InsertDatabase(
+		return new InsertData(
 			$container->get('Joomla.Power.Model.Upsert'),
 			$container->get('Insert')
 		);
 	}
 
 	/**
-	 * Get the Update Database
+	 * Get The Update Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  UpdateDatabase
+	 * @return  UpdateData
 	 * @since 3.2.0
 	 */
-	public function getUpdateDatabase(Container $container): UpdateDatabase
+	public function getUpdateData(Container $container): UpdateData
 	{
-		return new UpdateDatabase(
+		return new UpdateData(
 			$container->get('Joomla.Power.Model.Upsert'),
 			$container->get('Update')
 		);
+	}
+
+	/**
+	 * Get The Delete Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  DeleteData
+	 * @since 3.2.0
+	 */
+	public function getDeleteData(Container $container): DeleteData
+	{
+		return new DeleteData(
+			$container->get('Update')
+		);
+	}
+
+	/**
+	 * Get The Item Class.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  Item
+	 * @since 3.2.0
+	 */
+	public function getItem(Container $container): Item
+	{
+		return new Item(
+			$container->get('Joomla.Power.Load'),
+			$container->get('Joomla.Power.Insert'),
+			$container->get('Joomla.Power.Update'),
+			$container->get('Joomla.Power.Delete')
+		);
 	}
\ No newline at end of file
diff --git a/src/a2992a91-eec2-4957-811b-8cde22aa1438/settings.json b/src/a2992a91-eec2-4957-811b-8cde22aa1438/settings.json
index 6c29304..8aa893b 100644
--- a/src/a2992a91-eec2-4957-811b-8cde22aa1438/settings.json
+++ b/src/a2992a91-eec2-4957-811b-8cde22aa1438/settings.json
@@ -1,40 +1,49 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a2992a91-eec2-4957-811b-8cde22aa1438",
     "implements": [
         "-1"
     ],
     "load_selection": null,
-    "name": "Database",
+    "name": "Data",
     "power_version": "1.0.0",
-    "system_name": "JCB.JoomlaPower.Service.Database",
+    "system_name": "JCB.JoomlaPower.Service.Data",
     "type": "class",
     "use_selection": {
         "use_selection0": {
-            "use": "05744dd3-4030-4cf8-8dda-a93ab809b473",
+            "use": "bb29a833-73f7-4283-9327-bc7e41f0723b",
             "as": "ModelLoad"
         },
         "use_selection1": {
-            "use": "9206082e-a3f7-472e-98b2-de90d06cbdcd",
+            "use": "7c1fb50f-8fb1-4627-8705-6fedf7182ca5",
             "as": "ModelUpsert"
         },
         "use_selection2": {
             "use": "b4ea5de3-653f-43f9-b927-4ba6456b4d0a",
-            "as": "LoadDatabase"
+            "as": "LoadData"
         },
         "use_selection3": {
             "use": "9d53d45e-9b4d-45ec-827b-4916b91c907e",
-            "as": "InsertDatabase"
+            "as": "InsertData"
         },
         "use_selection4": {
             "use": "679473f6-3ea2-49d5-8273-1b29c8f0ad2b",
-            "as": "UpdateDatabase"
+            "as": "UpdateData"
+        },
+        "use_selection5": {
+            "use": "ef452ee0-9714-4b15-a86d-8ebc4af7734d",
+            "as": "DeleteData"
+        },
+        "use_selection6": {
+            "use": "9206082e-a3f7-472e-98b2-de90d06cbdcd",
+            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Service.Database",
-    "description": "Database Service Provider\r\n\r\n@since 3.2.0",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Service.Data",
+    "description": "Data Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\DI\\Container;\r\nuse Joomla\\DI\\ServiceProviderInterface;",
diff --git a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/README.md b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/README.md
index c2cdf45..bb5d3db 100644
--- a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/README.md
+++ b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customcode (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Customcode  #Gold {
diff --git a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/code.php b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/code.php
index bd9a93f..b5dc015 100644
--- a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/code.php
+++ b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
 
 
diff --git a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/settings.json b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/settings.json
index 25b990e..b4a17b3 100644
--- a/src/a356d103-74f3-49ca-8e4f-3bd37746f089/settings.json
+++ b/src/a356d103-74f3-49ca-8e4f-3bd37746f089/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a356d103-74f3-49ca-8e4f-3bd37746f089",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Customcode",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Customcode",
     "description": "Compiler Field Customcode\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/README.md b/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/README.md
index 90412bb..cc4058d 100644
--- a/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/README.md
+++ b/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/README.md
@@ -8,6 +8,7 @@
 ```
 # interface LockBaseInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode**
+> extends: ****
 ```uml
 @startuml
 interface LockBaseInterface  #Lavender {
diff --git a/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/settings.json b/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/settings.json
index 55ff60c..49b9a17 100644
--- a/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/settings.json
+++ b/src/a3c515f5-4adf-4eb3-b637-0a1add550da6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a3c515f5-4adf-4eb3-b637-0a1add550da6",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Customcode.LockBaseInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Customcode.LockBaseInterface",
     "description": "Customcode LockBase Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/code.php b/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/code.php
index 880c93c..df81be4 100644
--- a/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/code.php
+++ b/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\ToString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\ToString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/settings.json b/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/settings.json
index 421db8f..4cec5d3 100644
--- a/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/settings.json
+++ b/src/a4857c60-680c-4e0c-ae8f-9250a7b5e317/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CustomFieldLinks",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CustomFieldLinks",
     "description": "Custom Field Links Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/code.php b/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/code.php
index 92c1979..73598ef 100644
--- a/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/code.php
+++ b/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/settings.json b/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/settings.json
index 5c53f64..e54b20c 100644
--- a/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/settings.json
+++ b/src/a5189bfe-6d15-4452-9fa5-e3e57f7fa791/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ModelBasicField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ModelBasicField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ModelBasicField",
     "description": "Basic Field Model Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/README.md b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/README.md
index 35d2d05..b8e9f3c 100644
--- a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/README.md
+++ b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/README.md
@@ -8,29 +8,13 @@
 ```
 # abstract class Factory (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power**
+> extends: **ExtendingFactory**
 ```uml
 @startuml
 abstract Factory  #Orange {
-  # static $container
-  + {static} _(string $key) : Mixed
-  + {static} getContainer() : Container
   # {static} createContainer() : Container
 }
 
-note right of Factory::_
-  Get any class from the package container
-
-  since: 3.2.0
-  return: Mixed
-end note
-
-note right of Factory::getContainer
-  Get the global package container
-
-  since: 3.2.0
-  return: Container
-end note
-
 note right of Factory::createContainer
   Create a container object
 
diff --git a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.php b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.php
index 2396a07..c5b08cd 100644
--- a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.php
+++ b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.php
@@ -14,13 +14,15 @@ namespace VDM\Joomla\Componentbuilder\Power;
 
 use Joomla\DI\Container;
 use VDM\Joomla\Componentbuilder\Power\Service\Power;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Database;
-use VDM\Joomla\Componentbuilder\Power\Service\Database as PowerDatabase;
+use VDM\Joomla\Service\Database;
+use VDM\Joomla\Service\Model;
+use VDM\Joomla\Service\Data;
 use VDM\Joomla\Componentbuilder\Power\Service\Generator;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Gitea;
+use VDM\Joomla\Componentbuilder\Service\Gitea;
 use VDM\Joomla\Componentbuilder\Power\Service\Gitea as GiteaPower;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Utilities as GiteaUtilities;
-use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Gitea\Service\Utilities as GiteaUtilities;
+use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
 
 
 /**
@@ -28,45 +30,8 @@ use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
  * 
  * @since 3.2.0
  */
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
 {
-	/**
-	 * Global Package Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static $container = null;
-
-	/**
-	 * Get any class from the package container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  Mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
-	/**
-	 * Get the global package container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -78,7 +43,8 @@ abstract class Factory implements FactoryInterface
 		return (new Container())
 			->registerServiceProvider(new Power())
 			->registerServiceProvider(new Database())
-			->registerServiceProvider(new PowerDatabase())
+			->registerServiceProvider(new Model())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Generator())
 			->registerServiceProvider(new Gitea())
 			->registerServiceProvider(new GiteaPower())
diff --git a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.power b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.power
index b1fbee3..175007e 100644
--- a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.power
+++ b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/code.power
@@ -1,40 +1,3 @@
-	/**
-	 * Global Package Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static $container = null;
-
-	/**
-	 * Get any class from the package container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  Mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
-	/**
-	 * Get the global package container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -46,7 +9,8 @@
 		return (new Container())
 			->registerServiceProvider(new Power())
 			->registerServiceProvider(new Database())
-			->registerServiceProvider(new PowerDatabase())
+			->registerServiceProvider(new Model())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Generator())
 			->registerServiceProvider(new Gitea())
 			->registerServiceProvider(new GiteaPower())
diff --git a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/settings.json b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/settings.json
index 360dc2c..d5b5e07 100644
--- a/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/settings.json
+++ b/src/a5734b9e-a72d-494c-bc72-c3bc7506015f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "2e5bf608-de5c-4b00-a20d-47c26aa350d9",
     "guid": "a5734b9e-a72d-494c-bc72-c3bc7506015f",
     "implements": [
         "caf33c5d-858c-4f9a-894f-ab302ec5445a"
@@ -16,32 +16,37 @@
             "use": "02bc072b-1e89-46c1-9732-4da77b1a9ac9",
             "as": "default"
         },
-        "use_selection6": {
+        "use_selection1": {
             "use": "4815e1c7-a433-443d-a112-d1e03d7df84b",
             "as": "default"
         },
-        "use_selection1": {
-            "use": "7243aaf6-b76c-4391-8698-50abbfc98fbe",
-            "as": "PowerDatabase"
-        },
         "use_selection2": {
-            "use": "a7101bbc-3c81-4b52-a4aa-522291f7594b",
+            "use": "2dcedd6c-c95b-4a37-9cac-95d28faedca3",
             "as": "default"
         },
         "use_selection3": {
-            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "use": "a5daf189-3345-4b13-8716-c51f686f545b",
             "as": "default"
         },
         "use_selection4": {
+            "use": "a7101bbc-3c81-4b52-a4aa-522291f7594b",
+            "as": "default"
+        },
+        "use_selection5": {
+            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "as": "default"
+        },
+        "use_selection6": {
             "use": "510dc0f6-da3f-4a78-b43d-3a03e2cb5fae",
             "as": "GiteaPower"
         },
-        "use_selection5": {
+        "use_selection7": {
             "use": "6edf0cf3-c2b0-45c9-84d2-c6ef1c5d434c",
             "as": "GiteaUtilities"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Factory",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Factory",
     "description": "Power Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\DI\\Container;",
diff --git a/src/a601888d-12b6-427f-94ae-95004206e24e/code.php b/src/a601888d-12b6-427f-94ae-95004206e24e/code.php
index 4339ec9..04d6db3 100644
--- a/src/a601888d-12b6-427f-94ae-95004206e24e/code.php
+++ b/src/a601888d-12b6-427f-94ae-95004206e24e/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a601888d-12b6-427f-94ae-95004206e24e/settings.json b/src/a601888d-12b6-427f-94ae-95004206e24e/settings.json
index 6660d75..d044019 100644
--- a/src/a601888d-12b6-427f-94ae-95004206e24e/settings.json
+++ b/src/a601888d-12b6-427f-94ae-95004206e24e/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.PermissionGlobalAction",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionGlobalAction",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionGlobalAction",
     "description": "Permission Global Action Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a6052fe9-0d2b-4b36-b3e7-03b47c483542/settings.json b/src/a6052fe9-0d2b-4b36-b3e7-03b47c483542/settings.json
index d1a5775..8f402ee 100644
--- a/src/a6052fe9-0d2b-4b36-b3e7-03b47c483542/settings.json
+++ b/src/a6052fe9-0d2b-4b36-b3e7-03b47c483542/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.JoomlaPower.Injector",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.JoomlaPower.Injector",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.JoomlaPower.Injector",
     "description": "Compiler Joomla Power Injector\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/README.md b/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/README.md
index 517b776..ce626fb 100644
--- a/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/README.md
+++ b/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/README.md
@@ -8,6 +8,7 @@
 ```
 # abstract class Indent (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 abstract Indent  #Orange {
diff --git a/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/settings.json b/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/settings.json
index 7ebd126..ebafb4a 100644
--- a/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/settings.json
+++ b/src/a68c010b-e92e-47d5-8a44-d23cfddeb6c6/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a68c010b-e92e-47d5-8a44-d23cfddeb6c6",
     "implements": null,
     "load_selection": null,
@@ -15,6 +15,7 @@
             "as": "Compiler"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Indent",
     "description": "The Indentation Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    3rd September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/a6cdd935-c038-4a54-8446-54bed87f003c/README.md b/src/a6cdd935-c038-4a54-8446-54bed87f003c/README.md
index 3928d0e..c6dceda 100644
--- a/src/a6cdd935-c038-4a54-8446-54bed87f003c/README.md
+++ b/src/a6cdd935-c038-4a54-8446-54bed87f003c/README.md
@@ -8,6 +8,7 @@
 ```
 # interface PlaceholderInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface PlaceholderInterface  #Lavender {
diff --git a/src/a6cdd935-c038-4a54-8446-54bed87f003c/settings.json b/src/a6cdd935-c038-4a54-8446-54bed87f003c/settings.json
index 2ad69a8..3eba96c 100644
--- a/src/a6cdd935-c038-4a54-8446-54bed87f003c/settings.json
+++ b/src/a6cdd935-c038-4a54-8446-54bed87f003c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a6cdd935-c038-4a54-8446-54bed87f003c",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.PlaceholderInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.PlaceholderInterface",
     "description": "Compiler Placeholder Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/README.md b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/README.md
index 8b3ef7a..5f51774 100644
--- a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/README.md
+++ b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/README.md
@@ -8,6 +8,7 @@
 ```
 # class Sqldump (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Sqldump  #Gold {
diff --git a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/code.php b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/code.php
index fb99c2e..bc76ac2 100644
--- a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/code.php
+++ b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use Joomla\CMS\Factory;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/settings.json b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/settings.json
index cdd0b01..168c150 100644
--- a/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/settings.json
+++ b/src/a6e1227c-1efe-407d-84ef-03c6989a6a88/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a6e1227c-1efe-407d-84ef-03c6989a6a88",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Sqldump",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Sqldump",
     "description": "SQL Dump Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/README.md b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/README.md
index ffcfc4f..22f66b4 100644
--- a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/README.md
+++ b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/README.md
@@ -8,6 +8,7 @@
 ```
 # class Generator (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Service**
+> extends: ****
 ```uml
 @startuml
 class Generator  #Gold {
diff --git a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.php b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.php
index 23a82cd..2d56299 100644
--- a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.php
+++ b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.php
@@ -121,7 +121,7 @@ class Generator implements ServiceProviderInterface
 	public function getSearch(Container $container): Search
 	{
 		return new Search(
-			$container->get('Power.Database.Load'),
+			$container->get('Data.Load'),
 			$container->get('Power.Parser'),
 			$container->get('Power.Generator.Bucket')
 		);
diff --git a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.power b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.power
index 0c83d0a..5a70ad7 100644
--- a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.power
+++ b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/code.power
@@ -89,7 +89,7 @@
 	public function getSearch(Container $container): Search
 	{
 		return new Search(
-			$container->get('Power.Database.Load'),
+			$container->get('Data.Load'),
 			$container->get('Power.Parser'),
 			$container->get('Power.Generator.Bucket')
 		);
diff --git a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/settings.json b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/settings.json
index 139b603..c1ae36c 100644
--- a/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/settings.json
+++ b/src/a7101bbc-3c81-4b52-a4aa-522291f7594b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a7101bbc-3c81-4b52-a4aa-522291f7594b",
     "implements": [
         "-1"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Service.Generator",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Service.Generator",
     "description": "Generator Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/README.md b/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/README.md
index 46ae1b5..d6d8171 100644
--- a/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/README.md
+++ b/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customcode (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Customcode  #Gold {
diff --git a/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/settings.json b/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/settings.json
index b4327f7..4c8a7dd 100644
--- a/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/settings.json
+++ b/src/a74ac3b7-bb79-4639-8f14-54a8021be68b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a74ac3b7-bb79-4639-8f14-54a8021be68b",
     "implements": [
         "-1"
@@ -49,6 +49,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Customcode",
     "description": "Compiler Custom Code Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/code.php b/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/code.php
index 61e0c95..5b4bab5 100644
--- a/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/code.php
+++ b/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/settings.json b/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/settings.json
index 8b98088..8d378f4 100644
--- a/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/settings.json
+++ b/src/a7fc4913-6b1a-4eea-a168-fceb75fcf6ac/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUninstall",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUninstall",
     "description": "Database Uninstall Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/README.md b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/README.md
index e9462ac..451b738 100644
--- a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/README.md
+++ b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Permission (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Adminview**
+> extends: ****
 ```uml
 @startuml
 class Permission << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/code.php b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/code.php
index 563b066..75b15e0 100644
--- a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/code.php
+++ b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Adminview;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Builder\HasPermissions;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/settings.json b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/settings.json
index c996fd7..735ad89 100644
--- a/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/settings.json
+++ b/src/a85451d3-a5c5-446a-90ae-0cf715a16d94/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a85451d3-a5c5-446a-90ae-0cf715a16d94",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Adminview.Permission",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Adminview.Permission",
     "description": "Admin View Permission Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/README.md b/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/README.md
index b48660d..2fe3c6c 100644
--- a/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/README.md
+++ b/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsGroupControl (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsGroupControl << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/settings.json b/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/settings.json
index e4fddfe..02bf1b2 100644
--- a/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/settings.json
+++ b/src/a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a8d9583a-6ddb-4aac-b0d1-4c2d2d1c8c74",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGroupControl",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsGroupControl",
     "description": "Config Fieldsets Group Control Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/README.md b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/README.md
index 06a5aca..19b68ab 100644
--- a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/README.md
+++ b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/README.md
@@ -8,6 +8,7 @@
 ```
 # class Relations (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Relations  #Gold {
diff --git a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/code.php b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/code.php
index 9ea53b2..0512282 100644
--- a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/code.php
+++ b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/code.php
@@ -18,9 +18,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ListJoin;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\ListHeadOverride;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\FieldRelations;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/settings.json b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/settings.json
index 304ed09..47a99cc 100644
--- a/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/settings.json
+++ b/src/a8eb2fb1-88ed-4af8-842d-898eb915b588/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a8eb2fb1-88ed-4af8-842d-898eb915b588",
     "implements": null,
     "load_selection": null,
@@ -47,7 +47,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Relations",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Relations",
     "description": "Model Relations Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/README.md b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/README.md
index f4d5e37..e5af723 100644
--- a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/README.md
+++ b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/README.md
@@ -8,6 +8,7 @@
 ```
 # class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Joomlaplugin**
+> extends: ****
 ```uml
 @startuml
 class Structure  #Gold {
diff --git a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/code.php b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/code.php
index 5402c35..99e2bde 100644
--- a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/code.php
+++ b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/code.php
@@ -25,10 +25,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\Files;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
 
 
 /**
diff --git a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/settings.json b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/settings.json
index ec76ad2..088a77f 100644
--- a/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/settings.json
+++ b/src/a900b836-f2eb-4f13-8f28-b7cac839c7ff/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "a900b836-f2eb-4f13-8f28-b7cac839c7ff",
     "implements": null,
     "load_selection": null,
@@ -79,7 +79,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Joomlaplugin.Structure",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Joomlaplugin.Structure",
     "description": "Joomla Plugin Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/code.php b/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/code.php
index 3c6ac50..cd5074b 100644
--- a/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/code.php
+++ b/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\Count;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\Count;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/settings.json b/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/settings.json
index 9d608b2..52a752b 100644
--- a/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/settings.json
+++ b/src/a90a2495-9c26-446c-867e-9ee8f42fb6af/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Layout",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Layout",
     "description": "Layout Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/README.md b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/README.md
index 111d500..7da7991 100644
--- a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/README.md
+++ b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsSiteControl (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsSiteControl << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/code.php b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/code.php
index 6c1b8fb..fc09441 100644
--- a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/code.php
+++ b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/code.php
@@ -18,8 +18,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\ConfigFieldsetsCustomfield as C
 use VDM\Joomla\Componentbuilder\Compiler\Builder\HasMenuGlobal;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\FrontendParams;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\Request;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/settings.json b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/settings.json
index f4a6949..6d45466 100644
--- a/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/settings.json
+++ b/src/aac8502a-dbdf-42b6-a9ba-2c2e941f8b11/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "aac8502a-dbdf-42b6-a9ba-2c2e941f8b11",
     "implements": null,
     "load_selection": null,
@@ -43,7 +43,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsSiteControl",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsSiteControl",
     "description": "Config Fieldsets Site Control Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/code.php b/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/code.php
index af9d247..84fbf97 100644
--- a/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/code.php
+++ b/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/settings.json b/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/settings.json
index c5747c8..b40e975 100644
--- a/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/settings.json
+++ b/src/abdb7d20-a15e-42d8-bd91-7b09514df7f2/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteEditView",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteEditView",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteEditView",
     "description": "Site Edit View Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/README.md b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/README.md
index bed9a7f..61cfa61 100644
--- a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/README.md
+++ b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldXML (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldXML << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/code.php b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/code.php
index 23a9ee2..0c7da88 100644
--- a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/code.php
+++ b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/code.php
@@ -22,10 +22,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Field\Attributes;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Xml;
 use VDM\Joomla\Componentbuilder\Compiler\Creator\CustomFieldTypeFile;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Counter;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\FieldHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\String\FieldHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator\Fieldtypeinterface;
 
diff --git a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/settings.json b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/settings.json
index e71c704..5ab914f 100644
--- a/src/ac691a05-5630-4002-b166-dedec3fb0fcb/settings.json
+++ b/src/ac691a05-5630-4002-b166-dedec3fb0fcb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ac691a05-5630-4002-b166-dedec3fb0fcb",
     "implements": [
         "2d27c436-4d8e-4692-8382-d9e97af2231c"
@@ -73,7 +73,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldXML",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldXML",
     "description": "Field Simple XML Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/code.php b/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/code.php
index c73bbcd..2fe18db 100644
--- a/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/code.php
+++ b/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/code.php
@@ -13,9 +13,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/settings.json b/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/settings.json
index 19f541c..83c7e67 100644
--- a/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/settings.json
+++ b/src/adfbe68a-6d22-43e5-aee8-2787e8c47e75/settings.json
@@ -21,7 +21,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ContentOne",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ContentOne",
     "description": "Compiler Content One\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/README.md b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/README.md
index c07ff18..5148fe8 100644
--- a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/README.md
+++ b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/README.md
@@ -8,6 +8,7 @@
 ```
 # class Linkedviews (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Linkedviews  #Gold {
diff --git a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/code.php b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/code.php
index b3013c4..37854bb 100644
--- a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/code.php
+++ b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/settings.json b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/settings.json
index 07aff31..e38b3c4 100644
--- a/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/settings.json
+++ b/src/ae1fa148-91be-4f80-89a9-69d91ba9d575/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ae1fa148-91be-4f80-89a9-69d91ba9d575",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Linkedviews",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Linkedviews",
     "description": "Model Linked Views Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/README.md b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/README.md
index 4daf069..4ecb4aa 100644
--- a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/README.md
+++ b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Placeholder (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Placeholder << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/code.php b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/code.php
index f19ec34..e762fed 100644
--- a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/code.php
+++ b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/code.php
@@ -13,11 +13,11 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Component;
 
 
 use Joomla\CMS\Factory;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\NamespaceHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\NamespaceHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
diff --git a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/settings.json b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/settings.json
index 16654f8..a1e1cc0 100644
--- a/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/settings.json
+++ b/src/aecc17ba-0b0f-4e5c-ae43-71be063a3dcb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "aecc17ba-0b0f-4e5c-ae43-71be063a3dcb",
     "implements": [
         "97698747-c2ce-4e09-a470-acf6d8e86281"
@@ -45,7 +45,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Placeholder",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Placeholder",
     "description": "Get a Components Global Placeholders\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/af5beb21-214a-44f6-9090-7ea24c22e649/README.md b/src/af5beb21-214a-44f6-9090-7ea24c22e649/README.md
index 2e21393..ea2c0bc 100644
--- a/src/af5beb21-214a-44f6-9090-7ea24c22e649/README.md
+++ b/src/af5beb21-214a-44f6-9090-7ea24c22e649/README.md
@@ -8,6 +8,7 @@
 ```
 # class Whmcs (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Whmcs  #Gold {
diff --git a/src/af5beb21-214a-44f6-9090-7ea24c22e649/code.php b/src/af5beb21-214a-44f6-9090-7ea24c22e649/code.php
index f51e48e..378ca87 100644
--- a/src/af5beb21-214a-44f6-9090-7ea24c22e649/code.php
+++ b/src/af5beb21-214a-44f6-9090-7ea24c22e649/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/af5beb21-214a-44f6-9090-7ea24c22e649/settings.json b/src/af5beb21-214a-44f6-9090-7ea24c22e649/settings.json
index 7e99439..a81ee63 100644
--- a/src/af5beb21-214a-44f6-9090-7ea24c22e649/settings.json
+++ b/src/af5beb21-214a-44f6-9090-7ea24c22e649/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "af5beb21-214a-44f6-9090-7ea24c22e649",
     "implements": null,
     "load_selection": null,
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Whmcs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Whmcs",
     "description": "Model Whmcs Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b0b26749-5e2c-4b56-8982-48172f2531fa/code.php b/src/b0b26749-5e2c-4b56-8982-48172f2531fa/code.php
index 466ead5..fdb03f3 100644
--- a/src/b0b26749-5e2c-4b56-8982-48172f2531fa/code.php
+++ b/src/b0b26749-5e2c-4b56-8982-48172f2531fa/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/b0b26749-5e2c-4b56-8982-48172f2531fa/settings.json b/src/b0b26749-5e2c-4b56-8982-48172f2531fa/settings.json
index b4c63cf..8e363d4 100644
--- a/src/b0b26749-5e2c-4b56-8982-48172f2531fa/settings.json
+++ b/src/b0b26749-5e2c-4b56-8982-48172f2531fa/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ModelMediumField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ModelMediumField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ModelMediumField",
     "description": "Medium Field Model Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/code.php b/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/code.php
index 2e1ac9d..8d3cb87 100644
--- a/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/code.php
+++ b/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\GetString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\GetString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/settings.json b/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/settings.json
index bb56279..b67fd17 100644
--- a/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/settings.json
+++ b/src/b24f5184-7e7c-448d-9475-ff3f998f70c3/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.CategoryCode",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.CategoryCode",
     "description": "Category Code Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/code.php b/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/code.php
index c3c7c15..20cdb52 100644
--- a/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/code.php
+++ b/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/settings.json b/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/settings.json
index aeacd3d..53c38b3 100644
--- a/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/settings.json
+++ b/src/b3c36de1-9b18-4ea8-8383-6ab8f0e33996/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.DatabaseTables",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseTables",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseTables",
     "description": "Database Tables Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/README.md b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/README.md
index 9310cec..befcf0d 100644
--- a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/README.md
+++ b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/README.md
@@ -7,7 +7,7 @@
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
 # final class Load (Details)
-> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Database**
+> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Data**
 > extends: **ExtendingLoad**
 ```uml
 @startuml
diff --git a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/code.php b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/code.php
index c7cac78..f931a87 100644
--- a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/code.php
+++ b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/code.php
@@ -9,17 +9,17 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\JoomlaPower\Database;
+namespace VDM\Joomla\Componentbuilder\JoomlaPower\Data;
 
 
-use VDM\Joomla\Componentbuilder\Power\Database\LoadInterface;
-use VDM\Joomla\Componentbuilder\Power\Database\Load as ExtendingLoad;
+use VDM\Joomla\Interfaces\Data\LoadInterface;
+use VDM\Joomla\Abstraction\Data\Load as ExtendingLoad;
 
 
 /**
- * Power Database Load
+ * Joomla Power Data Load
  * 
- * @since 2.0.1
+ * @since 3.2.2
  */
 final class Load extends ExtendingLoad implements LoadInterface
 {
diff --git a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/settings.json b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/settings.json
index cc4b3ce..6171a43 100644
--- a/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/settings.json
+++ b/src/b4ea5de3-653f-43f9-b927-4ba6456b4d0a/settings.json
@@ -1,19 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "1f86db0f-e271-45df-8795-3e503ec76698",
+    "extends": "008d111c-9d43-427c-8dd4-2653e8b74be8",
     "guid": "b4ea5de3-653f-43f9-b927-4ba6456b4d0a",
     "implements": [
-        "99786f53-64b7-4d52-95b0-5306e7386c3f"
+        "c548640c-a461-4424-9ac5-8dfb5ed06d8d"
     ],
     "load_selection": null,
     "name": "Load",
     "power_version": "1.0.0",
-    "system_name": "JCB.JoomlaPower.Database.Load",
+    "system_name": "JCB.JoomlaPower.Data.Load",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.JoomlaPower.Database.Load",
-    "description": "Power Database Load\r\n\r\n@since 2.0.1",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Data.Load",
+    "description": "Joomla Power Data Load\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/README.md b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/README.md
index 59e03e6..2214f38 100644
--- a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/README.md
+++ b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldsetDynamic (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldsetDynamic << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/code.php b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/code.php
index dd2cec0..611e8c8 100644
--- a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/code.php
+++ b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Creator;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Creator\FieldAsString;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/settings.json b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/settings.json
index ea6513b..bb14cf7 100644
--- a/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/settings.json
+++ b/src/b5986fab-17ca-4236-8c0c-81ebd2bb82ba/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b5986fab-17ca-4236-8c0c-81ebd2bb82ba",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetDynamic",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldsetDynamic",
     "description": "Fieldset Dynamic Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/README.md b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/README.md
index e59fb6e..e3c6937 100644
--- a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/README.md
+++ b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Structuremultiple (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Structuremultiple << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/code.php b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/code.php
index cddc489..45f11cf 100644
--- a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/code.php
+++ b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/code.php
@@ -20,7 +20,7 @@ use VDM\Joomla\Componentbuilder\Compiler\Component;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Createdate;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Modifieddate;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Structure;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Placefix;
 
 
diff --git a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/settings.json b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/settings.json
index 9b713d1..ea3051c 100644
--- a/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/settings.json
+++ b/src/b69a23db-0a62-4840-a9c5-b2d8d63ecc6c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b69a23db-0a62-4840-a9c5-b2d8d63ecc6c",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Structuremultiple",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Structuremultiple",
     "description": "Multiple Files and Folders Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b80296eb-4718-4ed3-894d-69f3ac293733/README.md b/src/b80296eb-4718-4ed3-894d-69f3ac293733/README.md
index d6013ab..bff97aa 100644
--- a/src/b80296eb-4718-4ed3-894d-69f3ac293733/README.md
+++ b/src/b80296eb-4718-4ed3-894d-69f3ac293733/README.md
@@ -8,6 +8,7 @@
 ```
 # class Updatesql (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Updatesql  #Gold {
diff --git a/src/b80296eb-4718-4ed3-894d-69f3ac293733/code.php b/src/b80296eb-4718-4ed3-894d-69f3ac293733/code.php
index 5932f6e..c2242e1 100644
--- a/src/b80296eb-4718-4ed3-894d-69f3ac293733/code.php
+++ b/src/b80296eb-4718-4ed3-894d-69f3ac293733/code.php
@@ -14,9 +14,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/b80296eb-4718-4ed3-894d-69f3ac293733/settings.json b/src/b80296eb-4718-4ed3-894d-69f3ac293733/settings.json
index f0d643e..4b2e792 100644
--- a/src/b80296eb-4718-4ed3-894d-69f3ac293733/settings.json
+++ b/src/b80296eb-4718-4ed3-894d-69f3ac293733/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b80296eb-4718-4ed3-894d-69f3ac293733",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Updatesql",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Updatesql",
     "description": "Model Update sql Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/README.md b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/README.md
index a4af7dd..c28c666 100644
--- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/README.md
+++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/README.md
@@ -8,6 +8,7 @@
 ```
 # class Power (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class Power  #Gold {
@@ -25,7 +26,7 @@ class Power  #Gold {
   # Superpower $superpower
   # $db
   # $app
-  + __construct(?Config $config = null, ?Placeholder $placeholder = null, ...)
+  + __construct(Config $config, Placeholder $placeholder, ...)
   + load(array $guids) : void
   + get(string $guid, int $build) : ?object
   - set(string $guid) : bool
@@ -38,6 +39,8 @@ class Power  #Gold {
   - setComposer(string $guid) : void
   - setImplements(string $guid, array $use) : void
   - setExtend(string $guid, array $use, ...) : void
+  - setExtendClass(string $guid, array $use, ...) : void
+  - setExtendInterface(string $guid, array $use, ...) : void
   - setUseAs(string $guid, array $use, ...) : void
   - getCleanNamespace(string $namespace) : string
   - getUseNamespace(string $namespace, string $as = 'default') : string
@@ -54,11 +57,11 @@ note right of Power::__construct
   since: 3.2.0
   
   arguments:
-    ?Config $config = null
-    ?Placeholder $placeholder = null
-    ?Customcode $customcode = null
-    ?Gui $gui = null
-    ?Superpower $superpower = null
+    Config $config
+    Placeholder $placeholder
+    Customcode $customcode
+    Gui $gui
+    Superpower $superpower
 end note
 
 note left of Power::load
@@ -144,6 +147,18 @@ note left of Power::setImplements
 end note
 
 note right of Power::setExtend
+  Set Extend
+
+  since: 3.2.0
+  return: void
+  
+  arguments:
+    string $guid
+    array $use
+    array $as
+end note
+
+note left of Power::setExtendClass
   Set Extend Class
 
   since: 3.2.0
@@ -155,6 +170,18 @@ note right of Power::setExtend
     array $as
 end note
 
+note right of Power::setExtendInterface
+  Set Extend Interface
+
+  since: 3.2.2
+  return: void
+  
+  arguments:
+    string $guid
+    array $use
+    array $as
+end note
+
 note left of Power::setUseAs
   Set Extra Use Classes
 
diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php
index e854edc..dbb88e0 100644
--- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php
+++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.php
@@ -15,13 +15,12 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GuidHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\NamespaceHelper;
-use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\String\NamespaceHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
@@ -102,43 +101,43 @@ class Power implements PowerInterface
 	protected array $retry = [];
 
 	/**
-	 * Compiler Config
+	 * The Config Class.
 	 *
-	 * @var    Config
+	 * @var   Config
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Config $config;
 
 	/**
-	 * Compiler Placeholder
+	 * The Placeholder Class.
 	 *
-	 * @var    Placeholder
+	 * @var   Placeholder
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Placeholder $placeholder;
 
 	/**
-	 * Compiler Customcode
+	 * The Customcode Class.
 	 *
-	 * @var    Customcode
+	 * @var   Customcode
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Customcode $customcode;
 
 	/**
-	 * Compiler Customcode in Gui
+	 * The Gui Class.
 	 *
-	 * @var    Gui
+	 * @var   Gui
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Gui $gui;
 
 	/**
-	 * The JCB Superpower class
+	 * The Super Class.
 	 *
-	 * @var    Superpower
+	 * @var   Superpower
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Superpower $superpower;
 
 	/**
@@ -158,23 +157,22 @@ class Power implements PowerInterface
 	/**
 	 * Constructor.
 	 *
-	 * @param Config|null             $config       The compiler config object.
-	 * @param Placeholder|null        $placeholder  The compiler placeholder object.
-	 * @param Customcode|null         $customcode   The compiler customcode object.
-	 * @param Gui|null                $gui          The compiler customcode gui object.
-	 * @param Superpower|null         $superpower   The JCB superpower object.
+	 * @param Config        $config        The Config Class.
+	 * @param Placeholder   $placeholder   The Placeholder Class.
+	 * @param Customcode    $customcode    The Customcode Class.
+	 * @param Gui           $gui           The Gui Class.
+	 * @param Superpower    $superpower    The Super Class.
 	 *
-	 * @throws \Exception
 	 * @since 3.2.0
 	 */
-	public function __construct(?Config $config = null, ?Placeholder $placeholder = null,
-		?Customcode $customcode = null, ?Gui $gui = null, ?Superpower $superpower = null)
+	public function __construct(Config $config, Placeholder $placeholder,
+		Customcode $customcode, Gui $gui, Superpower $superpower)
 	{
-		$this->config = $config ?: Compiler::_('Config');
-		$this->placeholder = $placeholder ?: Compiler::_('Placeholder');
-		$this->customcode = $customcode ?: Compiler::_('Customcode');
-		$this->gui = $gui ?: Compiler::_('Customcode.Gui');
-		$this->superpower = $superpower ?: Compiler::_('Superpower');
+		$this->config = $config;
+		$this->placeholder = $placeholder;
+		$this->customcode = $customcode;
+		$this->gui = $gui;
+		$this->superpower = $superpower;
 		$this->db = Factory::getDbo();
 		$this->app = Factory::getApplication();
 	}
@@ -756,7 +754,7 @@ class Power implements PowerInterface
 	}
 
 	/**
-	 * Set Extend Class
+	 * Set Extend
 	 *
 	 * @param string  $guid  The global unique id of the power
 	 * @param array   $use   The use array
@@ -767,9 +765,29 @@ class Power implements PowerInterface
 	 */
 	private function setExtend(string $guid, array &$use, array &$as)
 	{
-		// does this extend something
-		$this->active[$guid]->extends_name = null;
+		// build the interface extends details
+		if ($this->active[$guid]->type === 'interface')
+		{
+			$this->setExtendInterface($guid, $use, $as);
+		}
+		else
+		{
+			$this->setExtendClass($guid, $use, $as);
+		}
+	}
 
+	/**
+	 * Set Extend Class
+	 *
+	 * @param string  $guid  The global unique id of the power
+	 * @param array   $use   The use array
+	 * @param array   $as    The use as array
+	 *
+	 * @return void
+	 * @since 3.2.0
+	 */
+	private function setExtendClass(string $guid, array &$use, array &$as)
+	{
 		// we first check for custom extending options
 		if ($this->active[$guid]->extends == -1
 			&& StringHelper::check($this->active[$guid]->extends_custom))
@@ -803,6 +821,89 @@ class Power implements PowerInterface
 				}
 			}
 		}
+		// reset it not found
+		else
+		{
+			$this->active[$guid]->extends = '';
+			$this->active[$guid]->extends_custom = '';
+		}
+		// always rest these for normal classes
+		$this->active[$guid]->extendsinterfaces = null;
+		$this->active[$guid]->extendsinterfaces_custom = '';
+	}
+
+	/**
+	 * Set Extend Interface
+	 *
+	 * @param string  $guid  The global unique id of the power
+	 * @param array   $use   The use array
+	 * @param array   $as    The use as array
+	 *
+	 * @return void
+	 * @since 3.2.2
+	 */
+	private function setExtendInterface(string $guid, array &$use, array &$as)
+	{
+		// does this extends interfaces
+		$this->active[$guid]->extendsinterfaces = (isset($this->active[$guid]->extendsinterfaces)
+			&& JsonHelper::check(
+				$this->active[$guid]->extendsinterfaces
+			)) ? json_decode((string)$this->active[$guid]->extendsinterfaces, true) : null;
+
+		if (ArrayHelper::check($this->active[$guid]->extendsinterfaces))
+		{
+			$bucket = [];
+			foreach ($this->active[$guid]->extendsinterfaces as $extend)
+			{
+				// we first check for custom extending options
+				if ($extend == -1
+					&& isset($this->active[$guid]->extendsinterfaces_custom)
+					&& StringHelper::check($this->active[$guid]->extendsinterfaces_custom))
+				{
+					// reserve extends custom for the linker
+					$this->active[$guid]->unchanged_extendsinterfaces_custom = $this->active[$guid]->extendsinterfaces_custom;
+
+					$bucket[] = $this->placeholder->update_(
+						$this->customcode->update($this->active[$guid]->extendsinterfaces_custom)
+					);
+
+					// just add once
+					unset($this->active[$guid]->extendsinterfaces_custom);
+				}
+				// does this extend existing
+				elseif (GuidHelper::valid($extend))
+				{
+					// check if it was set
+					if ($this->set($extend))
+					{
+						$extends_name = $this->get($extend, 1)->class_name;
+						// add to use
+						$use[] = $extend;
+
+						// add padding if the two names are the same
+						if ($extends_name === $this->active[$guid]->class_name)
+						{
+							$extends_name = $as[$extend]
+								= 'Extending' . $extends_name;
+						}
+						// get the name
+						$bucket[] = $extends_name;
+					}
+				}
+			}
+			if ($bucket !== [])
+			{
+				$this->active[$guid]->extends_name = implode(', ', $bucket);
+			}
+		}
+		else
+		{
+			$this->active[$guid]->extendsinterfaces = null;
+			$this->active[$guid]->extendsinterfaces_custom = '';
+		}
+		// always rest these for interfaces
+		$this->active[$guid]->extends = '';
+		$this->active[$guid]->extends_custom = '';
 	}
 
 	/**
diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power
index 72e54c7..e2dd8e8 100644
--- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power
+++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/code.power
@@ -63,43 +63,43 @@
 	protected array $retry = [];
 
 	/**
-	 * Compiler Config
+	 * The Config Class.
 	 *
-	 * @var    Config
+	 * @var   Config
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Config $config;
 
 	/**
-	 * Compiler Placeholder
+	 * The Placeholder Class.
 	 *
-	 * @var    Placeholder
+	 * @var   Placeholder
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Placeholder $placeholder;
 
 	/**
-	 * Compiler Customcode
+	 * The Customcode Class.
 	 *
-	 * @var    Customcode
+	 * @var   Customcode
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Customcode $customcode;
 
 	/**
-	 * Compiler Customcode in Gui
+	 * The Gui Class.
 	 *
-	 * @var    Gui
+	 * @var   Gui
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Gui $gui;
 
 	/**
-	 * The JCB Superpower class
+	 * The Super Class.
 	 *
-	 * @var    Superpower
+	 * @var   Superpower
 	 * @since 3.2.0
-	 **/
+	 */
 	protected Superpower $superpower;
 
 	/**
@@ -119,23 +119,22 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param Config|null             $config       The compiler config object.
-	 * @param Placeholder|null        $placeholder  The compiler placeholder object.
-	 * @param Customcode|null         $customcode   The compiler customcode object.
-	 * @param Gui|null                $gui          The compiler customcode gui object.
-	 * @param Superpower|null         $superpower   The JCB superpower object.
+	 * @param Config        $config        The Config Class.
+	 * @param Placeholder   $placeholder   The Placeholder Class.
+	 * @param Customcode    $customcode    The Customcode Class.
+	 * @param Gui           $gui           The Gui Class.
+	 * @param Superpower    $superpower    The Super Class.
 	 *
-	 * @throws \Exception
 	 * @since 3.2.0
 	 */
-	public function __construct(?Config $config = null, ?Placeholder $placeholder = null,
-		?Customcode $customcode = null, ?Gui $gui = null, ?Superpower $superpower = null)
+	public function __construct(Config $config, Placeholder $placeholder,
+		Customcode $customcode, Gui $gui, Superpower $superpower)
 	{
-		$this->config = $config ?: Compiler::_('Config');
-		$this->placeholder = $placeholder ?: Compiler::_('Placeholder');
-		$this->customcode = $customcode ?: Compiler::_('Customcode');
-		$this->gui = $gui ?: Compiler::_('Customcode.Gui');
-		$this->superpower = $superpower ?: Compiler::_('Superpower');
+		$this->config = $config;
+		$this->placeholder = $placeholder;
+		$this->customcode = $customcode;
+		$this->gui = $gui;
+		$this->superpower = $superpower;
 		$this->db = Factory::getDbo();
 		$this->app = Factory::getApplication();
 	}
@@ -717,7 +716,7 @@
 	}
 
 	/**
-	 * Set Extend Class
+	 * Set Extend
 	 *
 	 * @param string  $guid  The global unique id of the power
 	 * @param array   $use   The use array
@@ -728,9 +727,29 @@
 	 */
 	private function setExtend(string $guid, array &$use, array &$as)
 	{
-		// does this extend something
-		$this->active[$guid]->extends_name = null;
+		// build the interface extends details
+		if ($this->active[$guid]->type === 'interface')
+		{
+			$this->setExtendInterface($guid, $use, $as);
+		}
+		else
+		{
+			$this->setExtendClass($guid, $use, $as);
+		}
+	}
 
+	/**
+	 * Set Extend Class
+	 *
+	 * @param string  $guid  The global unique id of the power
+	 * @param array   $use   The use array
+	 * @param array   $as    The use as array
+	 *
+	 * @return void
+	 * @since 3.2.0
+	 */
+	private function setExtendClass(string $guid, array &$use, array &$as)
+	{
 		// we first check for custom extending options
 		if ($this->active[$guid]->extends == -1
 			&& StringHelper::check($this->active[$guid]->extends_custom))
@@ -764,6 +783,89 @@
 				}
 			}
 		}
+		// reset it not found
+		else
+		{
+			$this->active[$guid]->extends = '';
+			$this->active[$guid]->extends_custom = '';
+		}
+		// always rest these for normal classes
+		$this->active[$guid]->extendsinterfaces = null;
+		$this->active[$guid]->extendsinterfaces_custom = '';
+	}
+
+	/**
+	 * Set Extend Interface
+	 *
+	 * @param string  $guid  The global unique id of the power
+	 * @param array   $use   The use array
+	 * @param array   $as    The use as array
+	 *
+	 * @return void
+	 * @since 3.2.2
+	 */
+	private function setExtendInterface(string $guid, array &$use, array &$as)
+	{
+		// does this extends interfaces
+		$this->active[$guid]->extendsinterfaces = (isset($this->active[$guid]->extendsinterfaces)
+			&& JsonHelper::check(
+				$this->active[$guid]->extendsinterfaces
+			)) ? json_decode((string)$this->active[$guid]->extendsinterfaces, true) : null;
+
+		if (ArrayHelper::check($this->active[$guid]->extendsinterfaces))
+		{
+			$bucket = [];
+			foreach ($this->active[$guid]->extendsinterfaces as $extend)
+			{
+				// we first check for custom extending options
+				if ($extend == -1
+					&& isset($this->active[$guid]->extendsinterfaces_custom)
+					&& StringHelper::check($this->active[$guid]->extendsinterfaces_custom))
+				{
+					// reserve extends custom for the linker
+					$this->active[$guid]->unchanged_extendsinterfaces_custom = $this->active[$guid]->extendsinterfaces_custom;
+
+					$bucket[] = $this->placeholder->update_(
+						$this->customcode->update($this->active[$guid]->extendsinterfaces_custom)
+					);
+
+					// just add once
+					unset($this->active[$guid]->extendsinterfaces_custom);
+				}
+				// does this extend existing
+				elseif (GuidHelper::valid($extend))
+				{
+					// check if it was set
+					if ($this->set($extend))
+					{
+						$extends_name = $this->get($extend, 1)->class_name;
+						// add to use
+						$use[] = $extend;
+
+						// add padding if the two names are the same
+						if ($extends_name === $this->active[$guid]->class_name)
+						{
+							$extends_name = $as[$extend]
+								= 'Extending' . $extends_name;
+						}
+						// get the name
+						$bucket[] = $extends_name;
+					}
+				}
+			}
+			if ($bucket !== [])
+			{
+				$this->active[$guid]->extends_name = implode(', ', $bucket);
+			}
+		}
+		else
+		{
+			$this->active[$guid]->extendsinterfaces = null;
+			$this->active[$guid]->extendsinterfaces_custom = '';
+		}
+		// always rest these for interfaces
+		$this->active[$guid]->extends = '';
+		$this->active[$guid]->extends_custom = '';
 	}
 
 	/**
diff --git a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/settings.json b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/settings.json
index 25cb473..a052084 100644
--- a/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/settings.json
+++ b/src/b836c1b1-b6b1-44f7-b8a2-9a763a4185b1/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b836c1b1-b6b1-44f7-b8a2-9a763a4185b1",
     "implements": [
         "1133c2d7-ba7e-4c95-8cde-01f084d04682"
@@ -37,31 +37,28 @@
             "as": "default"
         },
         "use_selection6": {
-            "use": "d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac",
-            "as": "Compiler"
-        },
-        "use_selection7": {
             "use": "fa4bf18e-301e-42e3-91fb-6e0096c07adc",
             "as": "default"
         },
-        "use_selection8": {
+        "use_selection7": {
             "use": "06453ada-e370-49f0-b262-e3f5a8ed0c2c",
             "as": "default"
         },
-        "use_selection9": {
+        "use_selection8": {
             "use": "313b43c4-98c3-4f62-9177-2d73ec8eba31",
             "as": "default"
         },
-        "use_selection10": {
+        "use_selection9": {
             "use": "1bd48df2-4f7e-4581-9fe9-4b54e59105e3",
             "as": "default"
         },
-        "use_selection11": {
+        "use_selection10": {
             "use": "3ab0eba9-f37b-4b37-aec1-2e78067f2aff",
             "as": "Superpower"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Power",
     "description": "Compiler Power\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;",
diff --git a/src/b8a92303-8543-4d88-a83c-ece300eaba6d/code.php b/src/b8a92303-8543-4d88-a83c-ece300eaba6d/code.php
index 41c41f2..7f31e18 100644
--- a/src/b8a92303-8543-4d88-a83c-ece300eaba6d/code.php
+++ b/src/b8a92303-8543-4d88-a83c-ece300eaba6d/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/b8a92303-8543-4d88-a83c-ece300eaba6d/settings.json b/src/b8a92303-8543-4d88-a83c-ece300eaba6d/settings.json
index 77df266..5df76b7 100644
--- a/src/b8a92303-8543-4d88-a83c-ece300eaba6d/settings.json
+++ b/src/b8a92303-8543-4d88-a83c-ece300eaba6d/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ModelExpertField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ModelExpertField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ModelExpertField",
     "description": "Expert Field Model Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/code.php b/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/code.php
index 489b998..5504dcc 100644
--- a/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/code.php
+++ b/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/settings.json b/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/settings.json
index 5f22f03..d07566e 100644
--- a/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/settings.json
+++ b/src/b8b474d4-30e3-4b5a-9988-3adb3450998c/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.BaseSixFour",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.BaseSixFour",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.BaseSixFour",
     "description": "Base64 Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/b94aaedb-6774-4739-a63f-8f87141a85db/README.md b/src/b94aaedb-6774-4739-a63f-8f87141a85db/README.md
index 8a5e580..87e8189 100644
--- a/src/b94aaedb-6774-4739-a63f-8f87141a85db/README.md
+++ b/src/b94aaedb-6774-4739-a63f-8f87141a85db/README.md
@@ -8,6 +8,7 @@
 ```
 # class Event (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Event  #Gold {
diff --git a/src/b94aaedb-6774-4739-a63f-8f87141a85db/settings.json b/src/b94aaedb-6774-4739-a63f-8f87141a85db/settings.json
index 85cf19b..19c314c 100644
--- a/src/b94aaedb-6774-4739-a63f-8f87141a85db/settings.json
+++ b/src/b94aaedb-6774-4739-a63f-8f87141a85db/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b94aaedb-6774-4739-a63f-8f87141a85db",
     "implements": [
         "-1"
@@ -29,6 +29,7 @@
             "as": "J5Event"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Event",
     "description": "Event Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/b9f05dc4-d23a-499a-a826-9749b81818ed/README.md b/src/b9f05dc4-d23a-499a-a826-9749b81818ed/README.md
index 1e7f0d2..09848fd 100644
--- a/src/b9f05dc4-d23a-499a-a826-9749b81818ed/README.md
+++ b/src/b9f05dc4-d23a-499a-a826-9749b81818ed/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CoreRuleInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field**
+> extends: ****
 ```uml
 @startuml
 interface CoreRuleInterface  #Lavender {
diff --git a/src/b9f05dc4-d23a-499a-a826-9749b81818ed/settings.json b/src/b9f05dc4-d23a-499a-a826-9749b81818ed/settings.json
index 1ec84db..60d5137 100644
--- a/src/b9f05dc4-d23a-499a-a826-9749b81818ed/settings.json
+++ b/src/b9f05dc4-d23a-499a-a826-9749b81818ed/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "b9f05dc4-d23a-499a-a826-9749b81818ed",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Field.CoreRuleInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Field.CoreRuleInterface",
     "description": "Field Joomla Core Rule Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/code.php b/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/code.php
index f1e4acb..6cb68ea 100644
--- a/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/code.php
+++ b/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/settings.json b/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/settings.json
index e41e13d..87312d9 100644
--- a/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/settings.json
+++ b/src/bb26cf63-69a5-4c43-b2df-43284c9d907d/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.JsonString",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.JsonString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.JsonString",
     "description": "Json String Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/README.md b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/README.md
index 6314f70..3af3679 100644
--- a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/README.md
+++ b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/README.md
@@ -8,7 +8,7 @@
 ```
 # class Load (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Model**
-> extends: **AbstractionModel**
+> extends: **Model**
 ```uml
 @startuml
 class Load  #Gold {
diff --git a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/code.php b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/code.php
index b0b959c..4040277 100644
--- a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/code.php
+++ b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/code.php
@@ -12,11 +12,11 @@
 namespace VDM\Joomla\Componentbuilder\Power\Model;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Model as AbstractionModel;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Interfaces\ModelInterface;
+use VDM\Joomla\Abstraction\Model;
 
 
 /**
@@ -24,7 +24,7 @@ use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface;
  * 
  * @since 3.2.0
  */
-class Load extends AbstractionModel implements ModelInterface
+class Load extends Model implements ModelInterface
 {
 	/**
 	 * Model the value
diff --git a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/settings.json b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/settings.json
index e2a9213..c352210 100644
--- a/src/bb29a833-73f7-4283-9327-bc7e41f0723b/settings.json
+++ b/src/bb29a833-73f7-4283-9327-bc7e41f0723b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "-1",
+    "extends": "584747d1-3a86-453d-b7a3-a2219de8d777",
     "guid": "bb29a833-73f7-4283-9327-bc7e41f0723b",
     "implements": [
         "8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff"
@@ -12,10 +12,6 @@
     "system_name": "JCB.Power.Model.Load",
     "type": "class",
     "use_selection": {
-        "use_selection0": {
-            "use": "584747d1-3a86-453d-b7a3-a2219de8d777",
-            "as": "AbstractionModel"
-        },
         "use_selection1": {
             "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
             "as": "default"
@@ -29,9 +25,9 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Model.Load",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Model.Load",
     "description": "Power Model Load\r\n\r\n@since 3.2.0",
-    "extends_custom": "AbstractionModel",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/README.md b/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/README.md
index fa18b45..ec4ed26 100644
--- a/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/README.md
+++ b/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/README.md
@@ -8,6 +8,7 @@
 ```
 # class ArchitectureModel (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class ArchitectureModel  #Gold {
diff --git a/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/settings.json b/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/settings.json
index 725a1be..c959f75 100644
--- a/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/settings.json
+++ b/src/bbd36fbf-d905-47e8-8e67-9ea6ec734712/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "bbd36fbf-d905-47e8-8e67-9ea6ec734712",
     "implements": [
         "-1"
@@ -45,7 +45,8 @@
             "as": "J3ModelCanEditState"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.ArchitectureModel",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.ArchitectureModel",
     "description": "Architecture Model Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/README.md b/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/README.md
index 9af1f82..9406be2 100644
--- a/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/README.md
+++ b/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanEditState (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaThree\Model**
+> extends: ****
 ```uml
 @startuml
 class CanEditState << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/settings.json b/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/settings.json
index 8bbe98c..c823c05 100644
--- a/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/settings.json
+++ b/src/bce9ac2b-9f46-413f-b046-9e8af3f7dfbe/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "bce9ac2b-9f46-413f-b046-9e8af3f7dfbe",
     "implements": [
         "600515b1-493f-4448-96fe-018e54e087c8"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Model.CanEditState",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Model.CanEditState",
     "description": "Model Can Edit State Class for Joomla 3\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/bcf1e767-1566-440d-9f67-5c1bada934fa/code.php b/src/bcf1e767-1566-440d-9f67-5c1bada934fa/code.php
index 6b9aa6f..072de74 100644
--- a/src/bcf1e767-1566-440d-9f67-5c1bada934fa/code.php
+++ b/src/bcf1e767-1566-440d-9f67-5c1bada934fa/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/bcf1e767-1566-440d-9f67-5c1bada934fa/settings.json b/src/bcf1e767-1566-440d-9f67-5c1bada934fa/settings.json
index b307ed0..10d1d5e 100644
--- a/src/bcf1e767-1566-440d-9f67-5c1bada934fa/settings.json
+++ b/src/bcf1e767-1566-440d-9f67-5c1bada934fa/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ExtensionsParams",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ExtensionsParams",
     "description": "Extensions Params Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/README.md b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/README.md
index 8205194..b028c04 100644
--- a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/README.md
+++ b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/README.md
@@ -14,10 +14,8 @@
 class Config  #Gold {
   # JoomlaRegistry $config
   + __construct(?Input $input = null, ?JoomlaRegistry $params = null, ...)
+  # getGiteausername() : ?string
   # getGiteatoken() : ?string
-  # getAddcustomgiteaurl() : int
-  # getCustomgiteaurl() : ?string
-  # getCustomgiteatoken() : ?string
   # getSuperpowerscoreorganisation() : string
   # getSuperpowersinitrepos() : array
   # getTmppath() : string
@@ -25,6 +23,7 @@ class Config  #Gold {
   # getAddownpowers() : bool
   # getLocalpowersrepositorypath() : string
   # getApprovedpaths() : array
+  # getIndentationvalue() : string
 }
 
 note right of Config::__construct
@@ -38,34 +37,20 @@ note right of Config::__construct
     ?JoomlaRegistry $config = null
 end note
 
-note left of Config::getGiteatoken
+note left of Config::getGiteausername
+  get Gitea Username
+
+  since: 3.2.0
+  return: ?string
+end note
+
+note right of Config::getGiteatoken
   get Gitea Access Token
 
   since: 3.2.0
   return: ?string
 end note
 
-note right of Config::getAddcustomgiteaurl
-  get Add Custom Gitea URL
-
-  since: 3.2.0
-  return: int
-end note
-
-note left of Config::getCustomgiteaurl
-  get Custom Gitea URL
-
-  since: 3.2.0
-  return: ?string
-end note
-
-note right of Config::getCustomgiteatoken
-  get Custom Gitea Access Token
-
-  since: 3.2.0
-  return: ?string
-end note
-
 note left of Config::getSuperpowerscoreorganisation
   Get super power core organisation
 
@@ -114,6 +99,13 @@ note left of Config::getApprovedpaths
   since: 3.2.0
   return: array
 end note
+
+note right of Config::getIndentationvalue
+  get indentation value
+
+  since: 3.2.2
+  return: string
+end note
  
 @enduml
 ```
diff --git a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.php b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.php
index 4f0d823..d5e6243 100644
--- a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.php
+++ b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.php
@@ -13,9 +13,11 @@ namespace VDM\Joomla\Componentbuilder\Power;
 
 
 use Joomla\Registry\Registry as JoomlaRegistry;
-use Joomla\CMS\Factory as JoomlaFactory;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Factory as JoomlaFactory;
+use Joomla\Input\Input;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Componentbuilder\Utilities\RepoHelper;
 use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
 
 
@@ -43,9 +45,9 @@ class Config extends BaseConfig
 	/**
 	 * Constructor
 	 *
-	 * @param Input|null        $input      Input
-	 * @param Registry|null     $params     The component parameters
-	 * @param Registry|null     $config     The Joomla configuration
+	 * @param Input|null            $input      Input
+	 * @param JoomlaRegistry|null   $params     The component parameters
+	 * @param JoomlaRegistry|null   $config     The Joomla configuration
 	 *
 	 * @throws \Exception
 	 * @since 3.2.0
@@ -57,6 +59,17 @@ class Config extends BaseConfig
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -65,50 +78,7 @@ class Config extends BaseConfig
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -122,11 +92,6 @@ class Config extends BaseConfig
 		// the VDM default organisation is [joomla]
 		$organisation = 'joomla';
 
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('super_powers_core_organisation', $organisation);
-		}
-
 		return $organisation;
 	}
 
@@ -141,32 +106,31 @@ class Config extends BaseConfig
 		// some defaults repos we need by JCB
 		$repos = [];
 
-		// only add custom init with custom gitea
-		$paths = null;
-		if ($this->add_custom_gitea_url == 2)
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
 		{
-			$paths = $this->params->get('super_powers_init_repos');
+			$repos[$this->gitea_username . '.super-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'super-powers',
+				'read_branch' => 'master'
+			];
 		}
 
-		if (!empty($paths) && is_array($paths))
-		{
-			foreach ($paths as $path)
-			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
-				if ($owner !== null && $repo !== null)
-				{
-					// we make sure to get only the objects
-					$repos = ["{$owner}.{$repo}" => $path] + $repos;
-				}
-			}
-		}
-		else
-		{
-			$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'super-powers', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.gitea'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'gitea', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.openai'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'openai', 'branch' => 'master'];
-		}
+		$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'super-powers',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.gitea'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'gitea',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.openai'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'openai',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -239,19 +203,14 @@ class Config extends BaseConfig
 		// some defaults repos we need by JCB
 		$approved = $this->super_powers_init_repos;
 
-		if (!$this->add_own_powers)
-		{
-			return array_values($approved);
-		}
+		$paths = RepoHelper::get(1); // super powers = 1
 
-		$paths = $this->params->get('approved_paths');
-
-		if (!empty($paths))
+		if ($paths !== null)
 		{
 			foreach ($paths as $path)
 			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
 				if ($owner !== null && $repo !== null)
 				{
 					// we make sure to get only the objects
@@ -261,6 +220,17 @@ class Config extends BaseConfig
 		}
 
 		return array_values($approved);
+	}
+
+	/**
+	 * get indentation value
+	 *
+	 * @return  string  Indentation value
+	 * @since 3.2.2
+	 */
+	protected function getIndentationvalue(): string
+	{
+		return "\t";
 	}
 }
 
diff --git a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.power b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.power
index 8565070..c7d03f0 100644
--- a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.power
+++ b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/code.power
@@ -9,9 +9,9 @@
 	/**
 	 * Constructor
 	 *
-	 * @param Input|null        $input      Input
-	 * @param Registry|null     $params     The component parameters
-	 * @param Registry|null     $config     The Joomla configuration
+	 * @param Input|null            $input      Input
+	 * @param JoomlaRegistry|null   $params     The component parameters
+	 * @param JoomlaRegistry|null   $config     The Joomla configuration
 	 *
 	 * @throws \Exception
 	 * @since 3.2.0
@@ -23,6 +23,17 @@
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -31,50 +42,7 @@
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -88,11 +56,6 @@
 		// the VDM default organisation is [joomla]
 		$organisation = 'joomla';
 
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('super_powers_core_organisation', $organisation);
-		}
-
 		return $organisation;
 	}
 
@@ -107,32 +70,31 @@
 		// some defaults repos we need by JCB
 		$repos = [];
 
-		// only add custom init with custom gitea
-		$paths = null;
-		if ($this->add_custom_gitea_url == 2)
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
 		{
-			$paths = $this->params->get('super_powers_init_repos');
+			$repos[$this->gitea_username . '.super-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'super-powers',
+				'read_branch' => 'master'
+			];
 		}
 
-		if (!empty($paths) && is_array($paths))
-		{
-			foreach ($paths as $path)
-			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
-				if ($owner !== null && $repo !== null)
-				{
-					// we make sure to get only the objects
-					$repos = ["{$owner}.{$repo}" => $path] + $repos;
-				}
-			}
-		}
-		else
-		{
-			$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'super-powers', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.gitea'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'gitea', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.openai'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'openai', 'branch' => 'master'];
-		}
+		$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'super-powers',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.gitea'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'gitea',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.openai'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'openai',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -205,19 +167,14 @@
 		// some defaults repos we need by JCB
 		$approved = $this->super_powers_init_repos;
 
-		if (!$this->add_own_powers)
-		{
-			return array_values($approved);
-		}
+		$paths = RepoHelper::get(1); // super powers = 1
 
-		$paths = $this->params->get('approved_paths');
-
-		if (!empty($paths))
+		if ($paths !== null)
 		{
 			foreach ($paths as $path)
 			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
 				if ($owner !== null && $repo !== null)
 				{
 					// we make sure to get only the objects
@@ -227,4 +184,15 @@
 		}
 
 		return array_values($approved);
+	}
+
+	/**
+	 * get indentation value
+	 *
+	 * @return  string  Indentation value
+	 * @since 3.2.2
+	 */
+	protected function getIndentationvalue(): string
+	{
+		return "\t";
 	}
\ No newline at end of file
diff --git a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/settings.json b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/settings.json
index 5129e11..f91689d 100644
--- a/src/be4ccfae-65a9-401e-bdbe-637d8c226954/settings.json
+++ b/src/be4ccfae-65a9-401e-bdbe-637d8c226954/settings.json
@@ -17,11 +17,16 @@
         "use_selection1": {
             "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
             "as": "default"
+        },
+        "use_selection2": {
+            "use": "c6619b00-261c-473b-8094-d4fe9e6bab39",
+            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Config",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Config",
     "description": "Compiler Configurations\r\n\r\n\tAll these functions are accessed via the direct name without the get:\r\n\texample: $this->component_code_name calls: $this->getComponentcodename()\r\n\r\n\tAll values once called are cached, yet can be updated directly:\r\n\texample: $this->component_code_name = 'new_code_name'; \/\/ be warned!\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
-    "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory as JoomlaFactory;",
+    "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory as JoomlaFactory;\r\nuse Joomla\\Input\\Input;",
     "composer": ""
 }
\ No newline at end of file
diff --git a/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/code.php b/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/code.php
index 0319f3d..685320c 100644
--- a/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/code.php
+++ b/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/settings.json b/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/settings.json
index 1cdca08..730ca55 100644
--- a/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/settings.json
+++ b/src/bf92e1c1-3d5e-4e9d-a585-c79e1468df33/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherGroup",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherGroup",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherGroup",
     "description": "Other Group Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/README.md b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/README.md
index 85e469d..cb1845c 100644
--- a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/README.md
+++ b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/README.md
@@ -8,6 +8,7 @@
 ```
 # class Joomlamodules (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Joomlamodules  #Gold {
diff --git a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/code.php b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/code.php
index e735d86..959e805 100644
--- a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/code.php
+++ b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Joomlamodule\Data as Module;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 
 /**
diff --git a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/settings.json b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/settings.json
index c6ec63c..6366346 100644
--- a/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/settings.json
+++ b/src/bfdc4ce5-cb12-4fc6-9023-51cede25edd0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "bfdc4ce5-cb12-4fc6-9023-51cede25edd0",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Joomlamodules",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Joomlamodules",
     "description": "Model  Joomla Modules Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/code.php b/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/code.php
index 6a7ebc2..b9e25ea 100644
--- a/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/code.php
+++ b/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/settings.json b/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/settings.json
index 8c1cfc6..4832a3f 100644
--- a/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/settings.json
+++ b/src/c0e46033-5ade-4829-88b7-ca160d36a4d1/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteDecrypt",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteDecrypt",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteDecrypt",
     "description": "Site Decrypt Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/README.md b/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/README.md
index 7bafa91..f875ad6 100644
--- a/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/README.md
+++ b/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/README.md
@@ -8,6 +8,7 @@
 ```
 # interface ExtractorInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power**
+> extends: ****
 ```uml
 @startuml
 interface ExtractorInterface  #Lavender {
diff --git a/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/settings.json b/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/settings.json
index e0129bb..6fffa00 100644
--- a/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/settings.json
+++ b/src/c159425c-51f9-4a15-af99-f2d0c6d7aae8/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c159425c-51f9-4a15-af99-f2d0c6d7aae8",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Interfaces.Power.ExtractorInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Power.ExtractorInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Power.ExtractorInterface",
     "description": "Compiler Power Extractor\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/README.md b/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/README.md
index efa5b7b..ab900ec 100644
--- a/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/README.md
+++ b/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/README.md
@@ -8,6 +8,7 @@
 ```
 # class Phpadminview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Phpadminview  #Gold {
diff --git a/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/settings.json b/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/settings.json
index 7659d9d..483eba5 100644
--- a/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/settings.json
+++ b/src/c20a63e0-0eeb-4424-9d08-b1bf0f049dfe/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c20a63e0-0eeb-4424-9d08-b1bf0f049dfe",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "Templatelayout"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Phpadminview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Phpadminview",
     "description": "Model PHP Admin View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/README.md b/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/README.md
index 4938da1..54253ce 100644
--- a/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/README.md
+++ b/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/README.md
@@ -8,6 +8,7 @@
 ```
 # interface InputButtonInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field**
+> extends: ****
 ```uml
 @startuml
 interface InputButtonInterface  #Lavender {
diff --git a/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/settings.json b/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/settings.json
index cd0ffa3..62e6612 100644
--- a/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/settings.json
+++ b/src/c600f58c-3fe2-4d2d-b711-2660eab6effe/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c600f58c-3fe2-4d2d-b711-2660eab6effe",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Field.InputButtonInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Field.InputButtonInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Field.InputButtonInterface",
     "description": "Compiler Field Input Button\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c6619b00-261c-473b-8094-d4fe9e6bab39/README.md b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/README.md
new file mode 100644
index 0000000..edf4001
--- /dev/null
+++ b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/README.md
@@ -0,0 +1,38 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# abstract class RepoHelper (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Utilities**
+> extends: ****
+```uml
+@startuml
+abstract RepoHelper  #Orange {
+  + {static} get(int $target) : ?array
+}
+
+note right of RepoHelper::get
+  get available repositories of target area
+
+  since: 3.2.0
+  return: ?array
+end note
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.php b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.php
new file mode 100644
index 0000000..52036a9
--- /dev/null
+++ b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Utilities;
+
+
+use Joomla\CMS\Factory;
+
+
+/**
+ * Repositories Helper
+ * 
+ * @since 3.2.2
+ */
+abstract class RepoHelper
+{
+	/**
+	 * get available repositories of target area
+	 *
+	 * @param int   $target    The target area
+	 *
+	 * @return array|null   The result set
+	 * @since 3.2.0
+	 **/
+	public static function get(int $target): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array(
+				'type',
+				'base',
+				'organisation',
+				'repository',
+				'read_branch',
+				'write_branch',
+				'token',
+				'username',
+				'target',
+				'access_repo',
+				'guid'
+			)))
+			->from($db->quoteName('#__componentbuilder_repository'))
+			->where($db->quoteName('published') . ' >= 1')
+			->where($db->quoteName('target') . ' = ' . $target)
+			->order($db->quoteName('ordering') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$items = $db->loadObjectList();
+			$options = [];
+			foreach($items as $item)
+			{
+				if ($item->access_repo != 1)
+				{
+					unset($item->username);
+					unset($item->token);
+				}
+				unset($item->access_repo);
+				$path = $item->organisation . '/' . $item->repository;
+				$options[$path] =  $item;
+			}
+			return $options;
+		}
+
+		return null;
+	}
+}
+
diff --git a/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.power b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.power
new file mode 100644
index 0000000..eb6410e
--- /dev/null
+++ b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/code.power
@@ -0,0 +1,52 @@
+	/**
+	 * get available repositories of target area
+	 *
+	 * @param int   $target    The target area
+	 *
+	 * @return array|null   The result set
+	 * @since 3.2.0
+	 **/
+	public static function get(int $target): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array(
+				'type',
+				'base',
+				'organisation',
+				'repository',
+				'read_branch',
+				'write_branch',
+				'token',
+				'username',
+				'target',
+				'access_repo',
+				'guid'
+			)))
+			->from($db->quoteName('#__componentbuilder_repository'))
+			->where($db->quoteName('published') . ' >= 1')
+			->where($db->quoteName('target') . ' = ' . $target)
+			->order($db->quoteName('ordering') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$items = $db->loadObjectList();
+			$options = [];
+			foreach($items as $item)
+			{
+				if ($item->access_repo != 1)
+				{
+					unset($item->username);
+					unset($item->token);
+				}
+				unset($item->access_repo);
+				$path = $item->organisation . '/' . $item->repository;
+				$options[$path] =  $item;
+			}
+			return $options;
+		}
+
+		return null;
+	}
\ No newline at end of file
diff --git a/src/c6619b00-261c-473b-8094-d4fe9e6bab39/settings.json b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/settings.json
new file mode 100644
index 0000000..965c99e
--- /dev/null
+++ b/src/c6619b00-261c-473b-8094-d4fe9e6bab39/settings.json
@@ -0,0 +1,19 @@
+{
+    "add_head": "1",
+    "add_licensing_template": "2",
+    "extends": "",
+    "guid": "c6619b00-261c-473b-8094-d4fe9e6bab39",
+    "implements": null,
+    "load_selection": null,
+    "name": "RepoHelper",
+    "power_version": "1.0.0",
+    "system_name": "JCB.Utilities.RepoHelper",
+    "type": "abstract class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Utilities.RepoHelper",
+    "description": "Repositories Helper\r\n\r\n@since 3.2.2",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "use Joomla\\CMS\\Factory;",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/README.md b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/README.md
index 1ccf9ce..764d586 100644
--- a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/README.md
+++ b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreField (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class CoreField << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/code.php b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/code.php
index c000b68..529142d 100644
--- a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/code.php
+++ b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaFour;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface;
 
 
diff --git a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/settings.json b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/settings.json
index aa0fd6b..8d81b78 100644
--- a/src/c6818275-cdf7-4fce-a365-90d95a77a71c/settings.json
+++ b/src/c6818275-cdf7-4fce-a365-90d95a77a71c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c6818275-cdf7-4fce-a365-90d95a77a71c",
     "implements": [
         "e2f5fddf-cbc8-44ee-836c-7f3fb08d8900"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.CoreField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaFour.CoreField",
     "description": "Core Joomla Fields\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/README.md b/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/README.md
index cb106a4..af4bd66 100644
--- a/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/README.md
+++ b/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/README.md
@@ -8,6 +8,7 @@
 ```
 # class Field (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Field  #Gold {
diff --git a/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/settings.json b/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/settings.json
index 69ff1b3..4b72db4 100644
--- a/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/settings.json
+++ b/src/c6c30d66-3106-44eb-9272-b2cf7ec74613/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c6c30d66-3106-44eb-9272-b2cf7ec74613",
     "implements": [
         "-1"
@@ -85,6 +85,7 @@
             "as": "InputButton"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Field",
     "description": "Compiler Field\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/code.php b/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/code.php
index 681afeb..24535ca 100644
--- a/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/code.php
+++ b/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/settings.json b/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/settings.json
index 8056148..14fce1b 100644
--- a/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/settings.json
+++ b/src/c6de9da0-1a73-4c73-b355-7fe02efe4c9d/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.MainTextField",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.MainTextField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.MainTextField",
     "description": "Main Text Field Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/README.md b/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/README.md
index e22a51f..2e353b8 100644
--- a/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/README.md
+++ b/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/README.md
@@ -8,6 +8,7 @@
 ```
 # class BuilderAJ (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class BuilderAJ  #Gold {
diff --git a/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/settings.json b/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/settings.json
index d17dacf..3a541b3 100644
--- a/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/settings.json
+++ b/src/c7230c8c-ea88-4d8d-8c53-6136133195b7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c7230c8c-ea88-4d8d-8c53-6136133195b7",
     "implements": [
         "-1"
@@ -209,7 +209,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.BuilderAJ",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.BuilderAJ",
     "description": "Builder A-J Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/c72692b0-0a0f-412a-b05b-80002cbf886a/README.md b/src/c72692b0-0a0f-412a-b05b-80002cbf886a/README.md
index 8364607..af2a2b2 100644
--- a/src/c72692b0-0a0f-412a-b05b-80002cbf886a/README.md
+++ b/src/c72692b0-0a0f-412a-b05b-80002cbf886a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ClassInjector (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Power\Generator**
+> extends: ****
 ```uml
 @startuml
 class ClassInjector << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/c72692b0-0a0f-412a-b05b-80002cbf886a/settings.json b/src/c72692b0-0a0f-412a-b05b-80002cbf886a/settings.json
index 6ec3b11..898a15e 100644
--- a/src/c72692b0-0a0f-412a-b05b-80002cbf886a/settings.json
+++ b/src/c72692b0-0a0f-412a-b05b-80002cbf886a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c72692b0-0a0f-412a-b05b-80002cbf886a",
     "implements": null,
     "load_selection": null,
@@ -15,7 +15,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Generator.ClassInjector",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Generator.ClassInjector",
     "description": "Power code Generator for the Class Injection of JCB\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/code.php b/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/code.php
index 0f1b896..c8042b0 100644
--- a/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/code.php
+++ b/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/settings.json b/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/settings.json
index 1b638df..72536ee 100644
--- a/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/settings.json
+++ b/src/c7b6f0d5-ec47-4166-915c-e78d49b4fb63/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.GetModule",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.GetModule",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.GetModule",
     "description": "Get Module Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/README.md b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/README.md
index 694c4b8..0f60e8e 100644
--- a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/README.md
+++ b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/README.md
@@ -8,6 +8,7 @@
 ```
 # class Rule (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Rule  #Gold {
diff --git a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/code.php b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/code.php
index 3c79e0b..a563a26 100644
--- a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/code.php
+++ b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/code.php
@@ -17,8 +17,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreRuleInterface as CoreRule;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/settings.json b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/settings.json
index fd3a27b..7d123ef 100644
--- a/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/settings.json
+++ b/src/c871fb4a-4c33-4302-bb79-a9cd7ef4a557/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c871fb4a-4c33-4302-bb79-a9cd7ef4a557",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Rule",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Rule",
     "description": "Compiler Field Rules\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/code.php b/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/code.php
index 347c0b1..4ec7b1f 100644
--- a/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/code.php
+++ b/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/settings.json b/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/settings.json
index ed49546..4010883 100644
--- a/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/settings.json
+++ b/src/c8c5d364-d2bf-41c0-8c64-6b6fed1a28b6/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ListFieldClass",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ListFieldClass",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ListFieldClass",
     "description": "List Field Class Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/README.md b/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/README.md
index 3f938aa..82dc314 100644
--- a/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/README.md
+++ b/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/README.md
@@ -8,6 +8,7 @@
 ```
 # interface Fielddynamicinterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator**
+> extends: ****
 ```uml
 @startuml
 interface Fielddynamicinterface  #Lavender {
diff --git a/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/settings.json b/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/settings.json
index 5dfdacb..ebabf9e 100644
--- a/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/settings.json
+++ b/src/c902743e-8c6e-4a50-a4a3-8c955ef2960f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c902743e-8c6e-4a50-a4a3-8c955ef2960f",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Interfaces.Creator.Fielddynamicinterf",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fielddynamicinterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fielddynamicinterface",
     "description": "Field Creator Interface (needed for the container)\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/c9700450-4f44-4455-bc86-6a7660daadee/README.md b/src/c9700450-4f44-4455-bc86-6a7660daadee/README.md
index 283c58b..5dc2e17 100644
--- a/src/c9700450-4f44-4455-bc86-6a7660daadee/README.md
+++ b/src/c9700450-4f44-4455-bc86-6a7660daadee/README.md
@@ -8,6 +8,7 @@
 ```
 # interface AllowAddInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Architecture\Controller**
+> extends: ****
 ```uml
 @startuml
 interface AllowAddInterface  #Lavender {
diff --git a/src/c9700450-4f44-4455-bc86-6a7660daadee/settings.json b/src/c9700450-4f44-4455-bc86-6a7660daadee/settings.json
index 08b7e73..623efa3 100644
--- a/src/c9700450-4f44-4455-bc86-6a7660daadee/settings.json
+++ b/src/c9700450-4f44-4455-bc86-6a7660daadee/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "c9700450-4f44-4455-bc86-6a7660daadee",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Architecture.Controller.AllowAdd",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Controller.AllowAddInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Controller.AllowAddInterface",
     "description": "Controller Allow Add Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ca111518-e47c-4049-b1b2-cb010f23866f/README.md b/src/ca111518-e47c-4049-b1b2-cb010f23866f/README.md
index ff3cd6d..cad6fd7 100644
--- a/src/ca111518-e47c-4049-b1b2-cb010f23866f/README.md
+++ b/src/ca111518-e47c-4049-b1b2-cb010f23866f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Reverse (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Placeholder**
+> extends: ****
 ```uml
 @startuml
 class Reverse  #Gold {
diff --git a/src/ca111518-e47c-4049-b1b2-cb010f23866f/code.php b/src/ca111518-e47c-4049-b1b2-cb010f23866f/code.php
index d82f9cd..bee45b6 100644
--- a/src/ca111518-e47c-4049-b1b2-cb010f23866f/code.php
+++ b/src/ca111518-e47c-4049-b1b2-cb010f23866f/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
diff --git a/src/ca111518-e47c-4049-b1b2-cb010f23866f/settings.json b/src/ca111518-e47c-4049-b1b2-cb010f23866f/settings.json
index 86ee7d9..809de5c 100644
--- a/src/ca111518-e47c-4049-b1b2-cb010f23866f/settings.json
+++ b/src/ca111518-e47c-4049-b1b2-cb010f23866f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ca111518-e47c-4049-b1b2-cb010f23866f",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "JoomlaPower"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Placeholder.Reverse",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Placeholder.Reverse",
     "description": "Compiler Placeholder Reverse\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/README.md b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/README.md
index 2e3e6cf..c10b4c5 100644
--- a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/README.md
+++ b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Joomlamodule**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/code.php b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/code.php
index 7c3ac05..19197bb 100644
--- a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/code.php
+++ b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/code.php
@@ -25,11 +25,11 @@ use VDM\Joomla\Componentbuilder\Compiler\Model\Filesfolders;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Libraries;
 use VDM\Joomla\Componentbuilder\Compiler\Dynamicget\Data as Dynamicget;
 use VDM\Joomla\Componentbuilder\Compiler\Templatelayout\Data as Templatelayout;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\ClassfunctionHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\String\ClassfunctionHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/settings.json b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/settings.json
index 296331b..ac47ca3 100644
--- a/src/cb11e8d9-69c2-4095-831c-59908ea402e7/settings.json
+++ b/src/cb11e8d9-69c2-4095-831c-59908ea402e7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cb11e8d9-69c2-4095-831c-59908ea402e7",
     "implements": null,
     "load_selection": null,
@@ -75,7 +75,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Joomlamodule.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Joomlamodule.Data",
     "description": "Joomla Module Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Filter\\OutputFilter;",
diff --git a/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/README.md b/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/README.md
index 426d3f0..003c69a 100644
--- a/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/README.md
+++ b/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CanEditState (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFour\Model**
+> extends: ****
 ```uml
 @startuml
 class CanEditState << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/settings.json b/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/settings.json
index c9ee82b..5554450 100644
--- a/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/settings.json
+++ b/src/cb2a82a5-aa49-4d46-b765-9b3feb118208/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cb2a82a5-aa49-4d46-b765-9b3feb118208",
     "implements": [
         "600515b1-493f-4448-96fe-018e54e087c8"
@@ -29,7 +29,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Model.CanEditState",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Model.CanEditState",
     "description": "Model Can Edit State Class for Joomla 4\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/README.md b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/README.md
index 43e9fa3..a43402c 100644
--- a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/README.md
+++ b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Pathfix (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Pathfix  #Gold {
diff --git a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/code.php b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/code.php
index 30ef5d9..e2208f7 100644
--- a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/code.php
+++ b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Utilities;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/settings.json b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/settings.json
index ad6a7de..a65bd27 100644
--- a/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/settings.json
+++ b/src/cdc9b06d-8333-4fa7-ab4d-b810dd90f95f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cdc9b06d-8333-4fa7-ab4d-b810dd90f95f",
     "implements": null,
     "load_selection": null,
@@ -19,6 +19,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Pathfix",
     "description": "Compiler Path Fix\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/cddcac51-9a46-47c4-ba59-105c70453bd6/README.md b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/README.md
new file mode 100644
index 0000000..60ae64d
--- /dev/null
+++ b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/README.md
@@ -0,0 +1,166 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# abstract class FilterHelper (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Utilities**
+> extends: ****
+```uml
+@startuml
+abstract FilterHelper  #Orange {
+  + {static} extensions() : string
+  + {static} names(string $type, ?string $limiter = null) : ?array
+  + {static} linked(int $id, string $method) : ?array
+  + {static} namespaces() : ?array
+  + {static} namegroup(string $namespace) : ?array
+  + {static} translation(int $extension, string $type) : ?array
+  + {static} translations($language, $translated = true) : ?array
+  + {static} languages() : ?array
+  + {static} paths(string $path) : ?array
+  + {static} repositories(int $target) : ?array
+  - {static} joomla_component_admin_views(int $id) : ?array
+  - {static} joomla_component_custom_admin_views(int $id) : ?array
+  - {static} joomla_component_site_views(int $id) : ?array
+  - {static} joomla_component(int $id) : ?array
+  - {static} joomla_module(int $id) : ?array
+  - {static} joomla_plugin(int $id) : ?array
+  - {static} admin_view(int $id) : ?array
+}
+
+note right of FilterHelper::extensions
+  get extensions grouped list xml
+
+  since: 3.2.0
+  return: string
+end note
+
+note left of FilterHelper::names
+  Get by type the ids and system names
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::linked
+  get any area linked IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::namespaces
+  get the substrings of the namespace until the last "\" or "."
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::namegroup
+  get get IDs of powers matching namespaces
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::translation
+  get translation extension ids
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::translations
+  get translation ids
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::languages
+  get available languages
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::paths
+  get get IDs of powers link to this path
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::repositories
+  get available repositories of target area
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::joomla_component_admin_views
+  Get a component admin views IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::joomla_component_custom_admin_views
+  get a component custom admin views IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::joomla_component_site_views
+  get a component site views IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::joomla_component
+  get a component fields IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::joomla_module
+  get a module fields IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note left of FilterHelper::joomla_plugin
+  get a plugin fields IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+
+note right of FilterHelper::admin_view
+  get an admin view fields IDs
+
+  since: 3.2.0
+  return: ?array
+end note
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.php b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.php
new file mode 100644
index 0000000..999c38e
--- /dev/null
+++ b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.php
@@ -0,0 +1,850 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\Utilities;
+
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\GetHelper;
+
+
+/**
+ * Filter Helper
+ * 
+ * @since 3.2.0
+ */
+abstract class FilterHelper
+{
+	/**
+	 * get extensions grouped list xml
+	 *
+	 * @return string   The XML string of Extentions
+	 * @since 3.2.0
+	 */
+	public static function extensions(): string
+	{
+		// the extension types
+		$extensions = array(
+			'joomla_component' => 'COM_COMPONENTBUILDER_COMPONENT',
+			'joomla_module' => 'COM_COMPONENTBUILDER_MODULE',
+			'joomla_plugin' => 'COM_COMPONENTBUILDER_PLUGIN'
+		);
+
+		// get the extension values
+		foreach ($extensions as $extension => $label)
+		{
+			${$extension} = self::names($extension);
+		}
+
+		$xml = new \DOMDocument();
+		$xml->formatOutput = true;
+
+		$root = $xml->createElement('field');
+		$root->setAttributeNode(new \DOMAttr('name', 'extension'));
+		$root->setAttributeNode(new \DOMAttr('type', 'groupedlist'));
+		$root->setAttributeNode(new \DOMAttr('onchange', 'this.form.submit();'));
+
+		$root
+			->appendChild($xml->createElement('option', '- ' . Text::_('COM_COMPONENTBUILDER_SELECT_EXTENSION') . ' -'))
+			->setAttributeNode(new \DOMAttr('value', ''));
+
+		foreach ($extensions as $extension => $label)
+		{
+			$extension_node = $xml->createElement('group');
+			$extension_node->setAttributeNode(new \DOMAttr('label', $label));
+			if (!ArrayHelper::check(${$extension}))
+			{
+				$extension_node
+					->appendChild($xml->createElement('option', '- ' . Text::_('COM_COMPONENTBUILDER_NONE') . ' -'))
+					->setAttributeNode(new \DOMAttr('disabled', 'true'));
+			}
+			else
+			{
+				foreach (${$extension} as $id => $element)
+				{
+					$extension_node
+						->appendChild($xml->createElement('option', $element))
+						->setAttributeNode(new \DOMAttr('value', $extension . '__' . $id));
+				}
+			}
+			$root->appendChild($extension_node);
+		}
+		$xml->appendChild($root);
+
+		return $xml->saveXML();
+	}
+
+	/**
+	 * Get by type the ids and system names
+	 *
+	 * @param string       $type       The table name to get system names for
+	 * @param string|null  $limiter    The to limit by limiter table
+	 *
+	 * @return array|null   The array of system name and IDs
+	 * @since 3.2.0
+	 */
+	public static function names(string $type, ?string $limiter = null): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query
+			->select($db->quoteName(array('id', 'system_name')))
+			->from($db->quoteName('#__componentbuilder_' . $type))
+			->where($db->quoteName('published') . ' >= 1')
+			->order($db->quoteName('modified') . ' desc')
+			->order($db->quoteName('created') . ' desc');
+
+		// check if we have a limiter for admin views
+		if ($type === 'admin_view' && $limiter)
+		{
+			// first get all views
+			$admin_view_ids = array();
+
+			// if this is a plugin or a module, then no views
+			if (strpos($limiter, 'joomla_component') !== false)
+			{
+				$component = (int) str_replace('joomla_component__', '', $limiter);
+				// get the views of this component
+				if ($add_views = GetHelper::var('component_admin_views', (int) $component, 'joomla_component', 'addadmin_views'))
+				{
+					if (JsonHelper::check($add_views))
+					{
+						$add_views = json_decode($add_views, true);
+						if (ArrayHelper::check($add_views))
+						{
+							foreach($add_views as $add_view)
+							{
+								if (isset($add_view['adminview']))
+								{
+									$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+								}
+							}
+						}
+					}
+				}
+			}
+			// now check if we still have admin views
+			if (ArrayHelper::check($admin_view_ids))
+			{
+				$query->where($db->quoteName('id') . ' IN (' . implode(',', $admin_view_ids) . ')');
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('id', 'system_name');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get any area linked IDs
+	 *
+	 * @param int      $id        The target ID
+	 * @param string   $method    The target method
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function linked(int $id, string $method): ?array
+	{
+		// check if method exist
+		if (method_exists(__CLASS__, $method))
+		{
+			return self::{$method}($id);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get the substrings of the namespace until the last "\" or "."
+	 *
+	 * @return array|null   The result substrings
+	 * @since 3.2.0
+	 **/
+	public static function namespaces(): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select(
+				'DISTINCT REPLACE(SUBSTRING('
+				. $db->quoteName('namespace')
+				. ', 1, LENGTH('
+				. $db->quoteName('namespace')
+				. ') - LEAST('
+				. 'IF(LOCATE('
+				. $db->quote('\\')
+				. ', ' . $db->quoteName('namespace')
+				. ') > 0, LOCATE('
+				. $db->quote('\\')
+				. ', REVERSE('
+				. $db->quoteName('namespace')
+				. ')), 0), '
+				. 'IF(LOCATE('
+				. $db->quote('.')
+				. ', ' . $db->quoteName('namespace')
+				. ') > 0, LOCATE('
+				. $db->quote('.')
+				. ', REVERSE('
+				. $db->quoteName('namespace')
+				. ')), 0))), ".", "\\\") AS trimmed_namespace'
+			)
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1')
+			->order('LENGTH(trimmed_namespace) ASC, trimmed_namespace ASC');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('trimmed_namespace', 'trimmed_namespace');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get get IDs of powers matching namespaces
+	 *
+	 * @param string   $namespace    The target namespace
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function namegroup(string $namespace): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('id')))
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1');
+
+		// we get only those that match the owner and repo (smaller set)
+		$paths = explode('\\', $namespace);
+		foreach ($paths as $path)
+		{
+			$query->where($db->quoteName('namespace') . ' REGEXP ' . $db->quote($path));
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadColumn();
+		}
+
+		return null;
+	}
+
+	/**
+	 * get translation extension ids
+	 *
+	 * @param int      $extension    The target ID
+	 * @param string   $type         The target method
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function translation(int $extension, string $type): ?array
+	{
+		// only allow these columns (extension types)
+		$columns = array(
+			'joomla_component' => 'components',
+			'joomla_module' => 'modules',
+			'joomla_plugin' => 'plugins'
+		);
+
+		// check if the column name is correct
+		if (isset($columns[$type]))
+		{
+			$column = $columns[$type];
+			$db = Factory::getDbo();
+			$query = $db->getQuery(true);
+			$query
+				->select($db->quoteName(array('id', $column)))
+				->from($db->quoteName('#__componentbuilder_language_translation'))
+				->where($db->quoteName($column) . ' != ' . $db->quote(''));
+
+			$db->setQuery($query);
+			$db->execute();
+
+			if ($db->getNumRows())
+			{
+				$results = $db->loadAssocList();
+				$matches = [];
+				foreach ($results as $k => $v)
+				{
+					$value = json_decode($v[$column], true);
+					if (in_array($extension, $value))
+					{
+						$matches[$v['id']] = $v['id'];
+					}
+				}
+
+				// Checks that we found matches
+				if (ArrayHelper::check($matches))
+				{
+					return array_values($matches);
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * get translation ids
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function translations($language, $translated = true): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__componentbuilder_language_translation'));
+
+		// Build the where condition
+		if ($translated === true) // Translated
+		{
+			if ($language === 'all')
+			{
+				if (($languages = self::languages()) !== null)
+				{
+					$wheres = [];
+					foreach ($languages as $k => $v)
+					{
+						$wheres[] = $db->quoteName('translation') . ' LIKE ' . $db->quote('%' . $k . '%');
+					}
+					$query->where($wheres);
+				}
+			}
+			else
+			{
+				$query->where($db->quoteName('translation') . ' LIKE ' . $db->quote('%' . $language . '%'));
+			}
+		}
+		else // Not translated
+		{
+			if ($language === 'none')
+			{
+				$query->where(
+					array(
+						$db->quoteName('translation') . ' = ' . $db->quote(''),
+						$db->quoteName('translation') . ' = ' . $db->quote('[]'),
+						$db->quoteName('translation') . ' = ' . $db->quote('{}')
+					), 'OR'
+				);
+			}
+			else
+			{
+				$query->where($db->quoteName('translation') . ' NOT LIKE ' . $db->quote('%' . $language . '%'));
+			}
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return array_unique($db->loadColumn());
+		}
+
+		return null;
+	}
+
+	/**
+	 * get available languages
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function languages(): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('langtag', 'name')))
+			->from($db->quoteName('#__componentbuilder_language'))
+			->where($db->quoteName('published') . ' = 1')
+			->order($db->quoteName('name') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('langtag', 'name');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get get IDs of powers link to this path
+	 *
+	 * @param string   $path    The target PATH
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function paths(string $path): ?array
+	{
+		// get all this power ids
+		$ids = [];
+
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('id', 'approved_paths')))
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1');
+
+		// we get only those that match the owner and repo (smaller set)
+		if (($pos = strpos($path, '/')) !== false)
+		{
+			$owner = substr($path,  0, $pos);
+			$repo = substr($path, $pos + 1);
+			$query
+				->where($db->quoteName('approved_paths') . ' REGEXP ' . $db->quote($owner))
+				->where($db->quoteName('approved_paths') . ' REGEXP ' . $db->quote($repo));
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$result = $db->loadAssocList('id', 'approved_paths');
+			foreach ($result as $id => $paths)
+			{
+				if (JsonHelper::check($paths))
+				{
+					$paths = json_decode($paths, true);
+					if (ArrayHelper::check($paths) && in_array($path, $paths, true))
+					{
+						$ids[$id] = $id;
+					}
+				}
+			}
+
+			if (ArrayHelper::check($ids))
+			{
+				return $ids;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * get available repositories of target area
+	 *
+	 * @param int   $target    The target area
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function repositories(int $target): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('repository', 'organisation')))
+			->from($db->quoteName('#__componentbuilder_repository'))
+			->where($db->quoteName('published') . ' >= 1')
+			->where($db->quoteName('target') . ' = ' . $target)
+			->order($db->quoteName('ordering') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$items = $db->loadObjectList();
+			$options = [];
+			foreach($items as $item)
+			{
+				$path = $item->organisation . '/' . $item->repository;
+				$options[$path] =  $path;
+			}
+			return $options;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get a component admin views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_admin_views(int $id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_admin_views', (int) $id, 'joomla_component', 'addadmin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['adminview']))
+						{
+							$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component custom admin views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_custom_admin_views($id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_custom_admin_views', (int) $id, 'joomla_component', 'addcustom_admin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['customadminview']))
+						{
+							$admin_view_ids[(int) $add_view['customadminview']] = (int) $add_view['customadminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component site views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_site_views($id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_site_views', (int) $id, 'joomla_component', 'addsite_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['siteview']))
+						{
+							$admin_view_ids[(int) $add_view['siteview']] = (int) $add_view['siteview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		// first get all views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_admin_views', (int) $id, 'joomla_component', 'addadmin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['adminview']))
+						{
+							$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have views
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			foreach ($admin_view_ids as $admin_view)
+			{
+				// get all the fields linked to the admin view
+				if ($add_fields = GetHelper::var('admin_fields', (int) $admin_view, 'admin_view', 'addfields'))
+				{
+					if (JsonHelper::check($add_fields))
+					{
+						$add_fields = json_decode($add_fields, true);
+						if (ArrayHelper::check($add_fields))
+						{
+							foreach($add_fields as $add_field)
+							{
+								if (isset($add_field['field']))
+								{
+									$field_ids[(int) $add_field['field']] = (int) $add_field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// get config values
+		if ($add_config = GetHelper::var('component_config', (int) $id, 'joomla_component', 'addconfig'))
+		{
+			if (JsonHelper::check($add_config))
+			{
+				$add_config = json_decode($add_config, true);
+				if (ArrayHelper::check($add_config))
+				{
+					foreach($add_config as $add_conf)
+					{
+						if (isset($add_conf['field']))
+						{
+							$field_ids[(int) $add_conf['field']] = (int) $add_conf['field'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a module fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_module($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		if ($fields = GetHelper::var('joomla_module', (int) $id, 'id', 'fields'))
+		{
+			if (JsonHelper::check($fields))
+			{
+				$fields = json_decode($fields, true);
+				if (ArrayHelper::check($fields))
+				{
+					foreach($fields as $form)
+					{
+						if (isset($form['fields']) && ArrayHelper::check($form['fields']))
+						{
+							foreach ($form['fields'] as $field)
+							{
+								if (isset($field['field']))
+								{
+									$field_ids[(int) $field['field']] = (int) $field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a plugin fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_plugin($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		if ($fields = GetHelper::var('joomla_plugin', (int) $id, 'id', 'fields'))
+		{
+			if (JsonHelper::check($fields))
+			{
+				$fields = json_decode($fields, true);
+				if (ArrayHelper::check($fields))
+				{
+					foreach($fields as $form)
+					{
+						if (isset($form['fields']) && ArrayHelper::check($form['fields']))
+						{
+							foreach ($form['fields'] as $field)
+							{
+								if (isset($field['field']))
+								{
+									$field_ids[(int) $field['field']] = (int) $field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get an admin view fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function admin_view($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		// get all the fields linked to the admin view
+		if ($add_fields = GetHelper::var('admin_fields', (int) $id, 'admin_view', 'addfields'))
+		{
+			if (JsonHelper::check($add_fields))
+			{
+				$add_fields = json_decode($add_fields, true);
+				if (ArrayHelper::check($add_fields))
+				{
+					foreach($add_fields as $add_field)
+					{
+						if (isset($add_field['field']))
+						{
+							$field_ids[(int) $add_field['field']] = (int) $add_field['field'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+}
+
diff --git a/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.power b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.power
new file mode 100644
index 0000000..e98b951
--- /dev/null
+++ b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/code.power
@@ -0,0 +1,819 @@
+	/**
+	 * get extensions grouped list xml
+	 *
+	 * @return string   The XML string of Extentions
+	 * @since 3.2.0
+	 */
+	public static function extensions(): string
+	{
+		// the extension types
+		$extensions = array(
+			'joomla_component' => JustTEXT::_('Component'),
+			'joomla_module' => JustTEXT::_('Module'),
+			'joomla_plugin' => JustTEXT::_('Plugin')
+		);
+
+		// get the extension values
+		foreach ($extensions as $extension => $label)
+		{
+			${$extension} = self::names($extension);
+		}
+
+		$xml = new \DOMDocument();
+		$xml->formatOutput = true;
+
+		$root = $xml->createElement('field');
+		$root->setAttributeNode(new \DOMAttr('name', 'extension'));
+		$root->setAttributeNode(new \DOMAttr('type', 'groupedlist'));
+		$root->setAttributeNode(new \DOMAttr('onchange', 'this.form.submit();'));
+
+		$root
+			->appendChild($xml->createElement('option', '- ' . Text::_('Select Extension') . ' -'))
+			->setAttributeNode(new \DOMAttr('value', ''));
+
+		foreach ($extensions as $extension => $label)
+		{
+			$extension_node = $xml->createElement('group');
+			$extension_node->setAttributeNode(new \DOMAttr('label', $label));
+			if (!ArrayHelper::check(${$extension}))
+			{
+				$extension_node
+					->appendChild($xml->createElement('option', '- ' . Text::_('None') . ' -'))
+					->setAttributeNode(new \DOMAttr('disabled', 'true'));
+			}
+			else
+			{
+				foreach (${$extension} as $id => $element)
+				{
+					$extension_node
+						->appendChild($xml->createElement('option', $element))
+						->setAttributeNode(new \DOMAttr('value', $extension . '__' . $id));
+				}
+			}
+			$root->appendChild($extension_node);
+		}
+		$xml->appendChild($root);
+
+		return $xml->saveXML();
+	}
+
+	/**
+	 * Get by type the ids and system names
+	 *
+	 * @param string       $type       The table name to get system names for
+	 * @param string|null  $limiter    The to limit by limiter table
+	 *
+	 * @return array|null   The array of system name and IDs
+	 * @since 3.2.0
+	 */
+	public static function names(string $type, ?string $limiter = null): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query
+			->select($db->quoteName(array('id', 'system_name')))
+			->from($db->quoteName('#__componentbuilder_' . $type))
+			->where($db->quoteName('published') . ' >= 1')
+			->order($db->quoteName('modified') . ' desc')
+			->order($db->quoteName('created') . ' desc');
+
+		// check if we have a limiter for admin views
+		if ($type === 'admin_view' && $limiter)
+		{
+			// first get all views
+			$admin_view_ids = array();
+
+			// if this is a plugin or a module, then no views
+			if (strpos($limiter, 'joomla_component') !== false)
+			{
+				$component = (int) str_replace('joomla_component__', '', $limiter);
+				// get the views of this component
+				if ($add_views = GetHelper::var('component_admin_views', (int) $component, 'joomla_component', 'addadmin_views'))
+				{
+					if (JsonHelper::check($add_views))
+					{
+						$add_views = json_decode($add_views, true);
+						if (ArrayHelper::check($add_views))
+						{
+							foreach($add_views as $add_view)
+							{
+								if (isset($add_view['adminview']))
+								{
+									$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+								}
+							}
+						}
+					}
+				}
+			}
+			// now check if we still have admin views
+			if (ArrayHelper::check($admin_view_ids))
+			{
+				$query->where($db->quoteName('id') . ' IN (' . implode(',', $admin_view_ids) . ')');
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('id', 'system_name');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get any area linked IDs
+	 *
+	 * @param int      $id        The target ID
+	 * @param string   $method    The target method
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function linked(int $id, string $method): ?array
+	{
+		// check if method exist
+		if (method_exists(__CLASS__, $method))
+		{
+			return self::{$method}($id);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get the substrings of the namespace until the last "\" or "."
+	 *
+	 * @return array|null   The result substrings
+	 * @since 3.2.0
+	 **/
+	public static function namespaces(): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select(
+				'DISTINCT REPLACE(SUBSTRING('
+				. $db->quoteName('namespace')
+				. ', 1, LENGTH('
+				. $db->quoteName('namespace')
+				. ') - LEAST('
+				. 'IF(LOCATE('
+				. $db->quote('\\')
+				. ', ' . $db->quoteName('namespace')
+				. ') > 0, LOCATE('
+				. $db->quote('\\')
+				. ', REVERSE('
+				. $db->quoteName('namespace')
+				. ')), 0), '
+				. 'IF(LOCATE('
+				. $db->quote('.')
+				. ', ' . $db->quoteName('namespace')
+				. ') > 0, LOCATE('
+				. $db->quote('.')
+				. ', REVERSE('
+				. $db->quoteName('namespace')
+				. ')), 0))), ".", "\\\") AS trimmed_namespace'
+			)
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1')
+			->order('LENGTH(trimmed_namespace) ASC, trimmed_namespace ASC');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('trimmed_namespace', 'trimmed_namespace');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get get IDs of powers matching namespaces
+	 *
+	 * @param string   $namespace    The target namespace
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function namegroup(string $namespace): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('id')))
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1');
+
+		// we get only those that match the owner and repo (smaller set)
+		$paths = explode('\\', $namespace);
+		foreach ($paths as $path)
+		{
+			$query->where($db->quoteName('namespace') . ' REGEXP ' . $db->quote($path));
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadColumn();
+		}
+
+		return null;
+	}
+
+	/**
+	 * get translation extension ids
+	 *
+	 * @param int      $extension    The target ID
+	 * @param string   $type         The target method
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function translation(int $extension, string $type): ?array
+	{
+		// only allow these columns (extension types)
+		$columns = array(
+			'joomla_component' => 'components',
+			'joomla_module' => 'modules',
+			'joomla_plugin' => 'plugins'
+		);
+
+		// check if the column name is correct
+		if (isset($columns[$type]))
+		{
+			$column = $columns[$type];
+			$db = Factory::getDbo();
+			$query = $db->getQuery(true);
+			$query
+				->select($db->quoteName(array('id', $column)))
+				->from($db->quoteName('#__componentbuilder_language_translation'))
+				->where($db->quoteName($column) . ' != ' . $db->quote(''));
+
+			$db->setQuery($query);
+			$db->execute();
+
+			if ($db->getNumRows())
+			{
+				$results = $db->loadAssocList();
+				$matches = [];
+				foreach ($results as $k => $v)
+				{
+					$value = json_decode($v[$column], true);
+					if (in_array($extension, $value))
+					{
+						$matches[$v['id']] = $v['id'];
+					}
+				}
+
+				// Checks that we found matches
+				if (ArrayHelper::check($matches))
+				{
+					return array_values($matches);
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * get translation ids
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function translations($language, $translated = true): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__componentbuilder_language_translation'));
+
+		// Build the where condition
+		if ($translated === true) // Translated
+		{
+			if ($language === 'all')
+			{
+				if (($languages = self::languages()) !== null)
+				{
+					$wheres = [];
+					foreach ($languages as $k => $v)
+					{
+						$wheres[] = $db->quoteName('translation') . ' LIKE ' . $db->quote('%' . $k . '%');
+					}
+					$query->where($wheres);
+				}
+			}
+			else
+			{
+				$query->where($db->quoteName('translation') . ' LIKE ' . $db->quote('%' . $language . '%'));
+			}
+		}
+		else // Not translated
+		{
+			if ($language === 'none')
+			{
+				$query->where(
+					array(
+						$db->quoteName('translation') . ' = ' . $db->quote(''),
+						$db->quoteName('translation') . ' = ' . $db->quote('[]'),
+						$db->quoteName('translation') . ' = ' . $db->quote('{}')
+					), 'OR'
+				);
+			}
+			else
+			{
+				$query->where($db->quoteName('translation') . ' NOT LIKE ' . $db->quote('%' . $language . '%'));
+			}
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return array_unique($db->loadColumn());
+		}
+
+		return null;
+	}
+
+	/**
+	 * get available languages
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function languages(): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('langtag', 'name')))
+			->from($db->quoteName('#__componentbuilder_language'))
+			->where($db->quoteName('published') . ' = 1')
+			->order($db->quoteName('name') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			return $db->loadAssocList('langtag', 'name');
+		}
+
+		return null;
+	}
+
+	/**
+	 * get get IDs of powers link to this path
+	 *
+	 * @param string   $path    The target PATH
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function paths(string $path): ?array
+	{
+		// get all this power ids
+		$ids = [];
+
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('id', 'approved_paths')))
+			->from($db->quoteName('#__componentbuilder_power'))
+			->where($db->quoteName('published') . ' = 1');
+
+		// we get only those that match the owner and repo (smaller set)
+		if (($pos = strpos($path, '/')) !== false)
+		{
+			$owner = substr($path,  0, $pos);
+			$repo = substr($path, $pos + 1);
+			$query
+				->where($db->quoteName('approved_paths') . ' REGEXP ' . $db->quote($owner))
+				->where($db->quoteName('approved_paths') . ' REGEXP ' . $db->quote($repo));
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$result = $db->loadAssocList('id', 'approved_paths');
+			foreach ($result as $id => $paths)
+			{
+				if (JsonHelper::check($paths))
+				{
+					$paths = json_decode($paths, true);
+					if (ArrayHelper::check($paths) && in_array($path, $paths, true))
+					{
+						$ids[$id] = $id;
+					}
+				}
+			}
+
+			if (ArrayHelper::check($ids))
+			{
+				return $ids;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * get available repositories of target area
+	 *
+	 * @param int   $target    The target area
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 **/
+	public static function repositories(int $target): ?array
+	{
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select($db->quoteName(array('repository', 'organisation')))
+			->from($db->quoteName('#__componentbuilder_repository'))
+			->where($db->quoteName('published') . ' >= 1')
+			->where($db->quoteName('target') . ' = ' . $target)
+			->order($db->quoteName('ordering') . ' desc');
+		$db->setQuery($query);
+		$db->execute();
+
+		if ($db->getNumRows())
+		{
+			$items = $db->loadObjectList();
+			$options = [];
+			foreach($items as $item)
+			{
+				$path = $item->organisation . '/' . $item->repository;
+				$options[$path] =  $path;
+			}
+			return $options;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get a component admin views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_admin_views(int $id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_admin_views', (int) $id, 'joomla_component', 'addadmin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['adminview']))
+						{
+							$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component custom admin views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_custom_admin_views($id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_custom_admin_views', (int) $id, 'joomla_component', 'addcustom_admin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['customadminview']))
+						{
+							$admin_view_ids[(int) $add_view['customadminview']] = (int) $add_view['customadminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component site views IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component_site_views($id): ?array
+	{
+		// get all this components views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_site_views', (int) $id, 'joomla_component', 'addsite_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['siteview']))
+						{
+							$admin_view_ids[(int) $add_view['siteview']] = (int) $add_view['siteview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			return array_values($admin_view_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a component fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_component($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		// first get all views
+		$admin_view_ids = [];
+
+		// get the views of this component
+		if ($add_views = GetHelper::var('component_admin_views', (int) $id, 'joomla_component', 'addadmin_views'))
+		{
+			if (JsonHelper::check($add_views))
+			{
+				$add_views = json_decode($add_views, true);
+				if (ArrayHelper::check($add_views))
+				{
+					foreach($add_views as $add_view)
+					{
+						if (isset($add_view['adminview']))
+						{
+							$admin_view_ids[(int) $add_view['adminview']] = (int) $add_view['adminview'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have views
+		if (ArrayHelper::check($admin_view_ids))
+		{
+			foreach ($admin_view_ids as $admin_view)
+			{
+				// get all the fields linked to the admin view
+				if ($add_fields = GetHelper::var('admin_fields', (int) $admin_view, 'admin_view', 'addfields'))
+				{
+					if (JsonHelper::check($add_fields))
+					{
+						$add_fields = json_decode($add_fields, true);
+						if (ArrayHelper::check($add_fields))
+						{
+							foreach($add_fields as $add_field)
+							{
+								if (isset($add_field['field']))
+								{
+									$field_ids[(int) $add_field['field']] = (int) $add_field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// get config values
+		if ($add_config = GetHelper::var('component_config', (int) $id, 'joomla_component', 'addconfig'))
+		{
+			if (JsonHelper::check($add_config))
+			{
+				$add_config = json_decode($add_config, true);
+				if (ArrayHelper::check($add_config))
+				{
+					foreach($add_config as $add_conf)
+					{
+						if (isset($add_conf['field']))
+						{
+							$field_ids[(int) $add_conf['field']] = (int) $add_conf['field'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a module fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_module($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		if ($fields = GetHelper::var('joomla_module', (int) $id, 'id', 'fields'))
+		{
+			if (JsonHelper::check($fields))
+			{
+				$fields = json_decode($fields, true);
+				if (ArrayHelper::check($fields))
+				{
+					foreach($fields as $form)
+					{
+						if (isset($form['fields']) && ArrayHelper::check($form['fields']))
+						{
+							foreach ($form['fields'] as $field)
+							{
+								if (isset($field['field']))
+								{
+									$field_ids[(int) $field['field']] = (int) $field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get a plugin fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function joomla_plugin($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		if ($fields = GetHelper::var('joomla_plugin', (int) $id, 'id', 'fields'))
+		{
+			if (JsonHelper::check($fields))
+			{
+				$fields = json_decode($fields, true);
+				if (ArrayHelper::check($fields))
+				{
+					foreach($fields as $form)
+					{
+						if (isset($form['fields']) && ArrayHelper::check($form['fields']))
+						{
+							foreach ($form['fields'] as $field)
+							{
+								if (isset($field['field']))
+								{
+									$field_ids[(int) $field['field']] = (int) $field['field'];
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
+
+	/**
+	 * get an admin view fields IDs
+	 *
+	 * @param int   $id    The target ID
+	 *
+	 * @return array|null   The result ids
+	 * @since 3.2.0
+	 */
+	private static function admin_view($id): ?array
+	{
+		// we start the field array
+		$field_ids = [];
+
+		// get all the fields linked to the admin view
+		if ($add_fields = GetHelper::var('admin_fields', (int) $id, 'admin_view', 'addfields'))
+		{
+			if (JsonHelper::check($add_fields))
+			{
+				$add_fields = json_decode($add_fields, true);
+				if (ArrayHelper::check($add_fields))
+				{
+					foreach($add_fields as $add_field)
+					{
+						if (isset($add_field['field']))
+						{
+							$field_ids[(int) $add_field['field']] = (int) $add_field['field'];
+						}
+					}
+				}
+			}
+		}
+
+		// check that we have fields
+		if (ArrayHelper::check($field_ids))
+		{
+			return array_values($field_ids);
+		}
+
+		return null;
+	}
diff --git a/src/cddcac51-9a46-47c4-ba59-105c70453bd6/settings.json b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/settings.json
new file mode 100644
index 0000000..48cf458
--- /dev/null
+++ b/src/cddcac51-9a46-47c4-ba59-105c70453bd6/settings.json
@@ -0,0 +1,32 @@
+{
+    "add_head": "1",
+    "add_licensing_template": "2",
+    "extends": "",
+    "guid": "cddcac51-9a46-47c4-ba59-105c70453bd6",
+    "implements": null,
+    "load_selection": null,
+    "name": "FilterHelper",
+    "power_version": "1.0.0",
+    "system_name": "JCB.Utilities.FilterHelper",
+    "type": "abstract class",
+    "use_selection": {
+        "use_selection0": {
+            "use": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a",
+            "as": "default"
+        },
+        "use_selection1": {
+            "use": "4b225c51-d293-48e4-b3f6-5136cf5c3f18",
+            "as": "default"
+        },
+        "use_selection2": {
+            "use": "db87c339-5bb6-4291-a7ef-2c48ea1b06bc",
+            "as": "default"
+        }
+    },
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Utilities.FilterHelper",
+    "description": "Filter Helper\r\n\r\n@since 3.2.0",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Language\\Text;",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/ce0899a9-6271-4fc4-800a-697c122bb112/code.php b/src/ce0899a9-6271-4fc4-800a-697c122bb112/code.php
index 1fd3e41..4763c4d 100644
--- a/src/ce0899a9-6271-4fc4-800a-697c122bb112/code.php
+++ b/src/ce0899a9-6271-4fc4-800a-697c122bb112/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/ce0899a9-6271-4fc4-800a-697c122bb112/settings.json b/src/ce0899a9-6271-4fc4-800a-697c122bb112/settings.json
index 208d1af..eb29ad7 100644
--- a/src/ce0899a9-6271-4fc4-800a-697c122bb112/settings.json
+++ b/src/ce0899a9-6271-4fc4-800a-697c122bb112/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.DatabaseUniqueKeys",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUniqueKeys",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.DatabaseUniqueKeys",
     "description": "Database Unique Keys Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/README.md b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/README.md
index 698f41c..fd49e3e 100644
--- a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/README.md
+++ b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/code.php b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/code.php
index 3bdfcc6..f2f0b22 100644
--- a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/code.php
+++ b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/code.php
@@ -20,9 +20,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Customcode as FieldCustomcode;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Rule;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/settings.json b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/settings.json
index 2a6e21d..e5dc193 100644
--- a/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/settings.json
+++ b/src/ce826b66-0f2d-43da-8005-41b8e4cb21ee/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ce826b66-0f2d-43da-8005-41b8e4cb21ee",
     "implements": null,
     "load_selection": null,
@@ -51,7 +51,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.Data",
     "description": "Compiler Field Data\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/cebdcccb-24c5-46db-92de-63453852dcb8/README.md b/src/cebdcccb-24c5-46db-92de-63453852dcb8/README.md
index 8baabd9..6ecd3f6 100644
--- a/src/cebdcccb-24c5-46db-92de-63453852dcb8/README.md
+++ b/src/cebdcccb-24c5-46db-92de-63453852dcb8/README.md
@@ -8,6 +8,7 @@
 ```
 # class Adminviews (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Adminviews  #Gold {
diff --git a/src/cebdcccb-24c5-46db-92de-63453852dcb8/code.php b/src/cebdcccb-24c5-46db-92de-63453852dcb8/code.php
index befa3ce..73cd0fb 100644
--- a/src/cebdcccb-24c5-46db-92de-63453852dcb8/code.php
+++ b/src/cebdcccb-24c5-46db-92de-63453852dcb8/code.php
@@ -16,9 +16,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Adminview\Data as Admin;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\SiteEditView;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\AdminFilterType;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/cebdcccb-24c5-46db-92de-63453852dcb8/settings.json b/src/cebdcccb-24c5-46db-92de-63453852dcb8/settings.json
index 7869b12..fc77971 100644
--- a/src/cebdcccb-24c5-46db-92de-63453852dcb8/settings.json
+++ b/src/cebdcccb-24c5-46db-92de-63453852dcb8/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cebdcccb-24c5-46db-92de-63453852dcb8",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Adminviews",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Adminviews",
     "description": "Model Admin Views Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/cef2815b-f72b-402a-b769-f028f676692d/README.md b/src/cef2815b-f72b-402a-b769-f028f676692d/README.md
index a873f12..307f6c5 100644
--- a/src/cef2815b-f72b-402a-b769-f028f676692d/README.md
+++ b/src/cef2815b-f72b-402a-b769-f028f676692d/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Adminview**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/cef2815b-f72b-402a-b769-f028f676692d/code.php b/src/cef2815b-f72b-402a-b769-f028f676692d/code.php
index 40107e6..5012669 100644
--- a/src/cef2815b-f72b-402a-b769-f028f676692d/code.php
+++ b/src/cef2815b-f72b-402a-b769-f028f676692d/code.php
@@ -35,9 +35,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Model\Customalias;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Sql;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Mysqlsettings;
 use VDM\Joomla\Componentbuilder\Compiler\Builder\SiteEditView;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/cef2815b-f72b-402a-b769-f028f676692d/settings.json b/src/cef2815b-f72b-402a-b769-f028f676692d/settings.json
index 587efe5..3167b67 100644
--- a/src/cef2815b-f72b-402a-b769-f028f676692d/settings.json
+++ b/src/cef2815b-f72b-402a-b769-f028f676692d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cef2815b-f72b-402a-b769-f028f676692d",
     "implements": null,
     "load_selection": null,
@@ -111,7 +111,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Adminview.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Adminview.Data",
     "description": "Admin View Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/cfdf0968-f394-4459-933c-ad1674fb1041/README.md b/src/cfdf0968-f394-4459-933c-ad1674fb1041/README.md
index 8f6114b..cb52c86 100644
--- a/src/cfdf0968-f394-4459-933c-ad1674fb1041/README.md
+++ b/src/cfdf0968-f394-4459-933c-ad1674fb1041/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Request (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class Request << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/cfdf0968-f394-4459-933c-ad1674fb1041/code.php b/src/cfdf0968-f394-4459-933c-ad1674fb1041/code.php
index 03189c7..7ec05ee 100644
--- a/src/cfdf0968-f394-4459-933c-ad1674fb1041/code.php
+++ b/src/cfdf0968-f394-4459-933c-ad1674fb1041/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Creator;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Builder\Request as RequestBuilder;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/cfdf0968-f394-4459-933c-ad1674fb1041/settings.json b/src/cfdf0968-f394-4459-933c-ad1674fb1041/settings.json
index 2cacbfd..0948ad5 100644
--- a/src/cfdf0968-f394-4459-933c-ad1674fb1041/settings.json
+++ b/src/cfdf0968-f394-4459-933c-ad1674fb1041/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cfdf0968-f394-4459-933c-ad1674fb1041",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.Request",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.Request",
     "description": "Request Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/README.md b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/README.md
index 3950edc..19f64cb 100644
--- a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/README.md
+++ b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Dashboard (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Dashboard << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/code.php b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/code.php
index d638f09..12a0ba2 100644
--- a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/code.php
+++ b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/code.php
@@ -18,8 +18,8 @@ use Joomla\CMS\Application\CMSApplication;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
 use VDM\Joomla\Componentbuilder\Compiler\Component;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/settings.json b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/settings.json
index 78336cc..1f0f8ab 100644
--- a/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/settings.json
+++ b/src/cfe62a32-8818-4bfb-8751-2f1e109b5336/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "cfe62a32-8818-4bfb-8751-2f1e109b5336",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Dashboard",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Dashboard",
     "description": "Compiler Component Dynamic Dashboard\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Application\\CMSApplication;",
diff --git a/src/d33b9278-c409-4aec-a047-b72f56712391/README.md b/src/d33b9278-c409-4aec-a047-b72f56712391/README.md
index ef9773f..da16bc4 100644
--- a/src/d33b9278-c409-4aec-a047-b72f56712391/README.md
+++ b/src/d33b9278-c409-4aec-a047-b72f56712391/README.md
@@ -8,6 +8,7 @@
 ```
 # class Extractor (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Language**
+> extends: ****
 ```uml
 @startuml
 class Extractor  #Gold {
diff --git a/src/d33b9278-c409-4aec-a047-b72f56712391/code.php b/src/d33b9278-c409-4aec-a047-b72f56712391/code.php
index 9753668..57a0bd7 100644
--- a/src/d33b9278-c409-4aec-a047-b72f56712391/code.php
+++ b/src/d33b9278-c409-4aec-a047-b72f56712391/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/d33b9278-c409-4aec-a047-b72f56712391/settings.json b/src/d33b9278-c409-4aec-a047-b72f56712391/settings.json
index ff1cdd6..7dbc7db 100644
--- a/src/d33b9278-c409-4aec-a047-b72f56712391/settings.json
+++ b/src/d33b9278-c409-4aec-a047-b72f56712391/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d33b9278-c409-4aec-a047-b72f56712391",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Language.Extractor",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Language.Extractor",
     "description": "Compiler Language Extractor\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d393c946-4481-43fa-b737-449119dd0a63/code.php b/src/d393c946-4481-43fa-b737-449119dd0a63/code.php
index 40bc763..8ebd6c9 100644
--- a/src/d393c946-4481-43fa-b737-449119dd0a63/code.php
+++ b/src/d393c946-4481-43fa-b737-449119dd0a63/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/d393c946-4481-43fa-b737-449119dd0a63/settings.json b/src/d393c946-4481-43fa-b737-449119dd0a63/settings.json
index d8b60d6..0cfb513 100644
--- a/src/d393c946-4481-43fa-b737-449119dd0a63/settings.json
+++ b/src/d393c946-4481-43fa-b737-449119dd0a63/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteFieldDecodeFilter",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteFieldDecodeFilter",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteFieldDecodeFilter",
     "description": "Site Field Decode Filter Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/README.md b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/README.md
index 0280eea..9685e08 100644
--- a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/README.md
+++ b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/README.md
@@ -8,6 +8,7 @@
 ```
 # class Structure (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Library**
+> extends: ****
 ```uml
 @startuml
 class Structure  #Gold {
diff --git a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/code.php b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/code.php
index 1a230f0..3a18703 100644
--- a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/code.php
+++ b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/code.php
@@ -23,10 +23,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Folder;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\File;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
 
 
 /**
diff --git a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/settings.json b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/settings.json
index 85385d2..0798e95 100644
--- a/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/settings.json
+++ b/src/d3ce5763-4d00-4245-a175-54fc2e80e9b7/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d3ce5763-4d00-4245-a175-54fc2e80e9b7",
     "implements": null,
     "load_selection": null,
@@ -67,7 +67,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Library.Structure",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Library.Structure",
     "description": "Library Structure Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder as JoomlaFolder;",
diff --git a/src/d42e1fac-3c05-4a22-8878-2abd43019811/README.md b/src/d42e1fac-3c05-4a22-8878-2abd43019811/README.md
index 975642c..03fa6ae 100644
--- a/src/d42e1fac-3c05-4a22-8878-2abd43019811/README.md
+++ b/src/d42e1fac-3c05-4a22-8878-2abd43019811/README.md
@@ -8,6 +8,7 @@
 ```
 # final class InstallScript (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class InstallScript << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/d42e1fac-3c05-4a22-8878-2abd43019811/code.php b/src/d42e1fac-3c05-4a22-8878-2abd43019811/code.php
index 8ea214a..a9acfa5 100644
--- a/src/d42e1fac-3c05-4a22-8878-2abd43019811/code.php
+++ b/src/d42e1fac-3c05-4a22-8878-2abd43019811/code.php
@@ -13,8 +13,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Extension\JoomlaFour;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Extension\InstallInterface;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\GetScriptInterface;
diff --git a/src/d42e1fac-3c05-4a22-8878-2abd43019811/settings.json b/src/d42e1fac-3c05-4a22-8878-2abd43019811/settings.json
index 1a010e9..e77733b 100644
--- a/src/d42e1fac-3c05-4a22-8878-2abd43019811/settings.json
+++ b/src/d42e1fac-3c05-4a22-8878-2abd43019811/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d42e1fac-3c05-4a22-8878-2abd43019811",
     "implements": [
         "2e6731ba-3a03-4836-b2c2-4e50e38cb890"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaFour.InstallScript",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Extension.JoomlaFour.InstallScript",
     "description": "Loading the Extension Installation Script Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d44f3294-6b68-4d85-a617-15fb772b7d14/README.md b/src/d44f3294-6b68-4d85-a617-15fb772b7d14/README.md
index 7ddf868..658bac3 100644
--- a/src/d44f3294-6b68-4d85-a617-15fb772b7d14/README.md
+++ b/src/d44f3294-6b68-4d85-a617-15fb772b7d14/README.md
@@ -8,6 +8,7 @@
 ```
 # interface Fieldsetinterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Creator**
+> extends: ****
 ```uml
 @startuml
 interface Fieldsetinterface  #Lavender {
diff --git a/src/d44f3294-6b68-4d85-a617-15fb772b7d14/settings.json b/src/d44f3294-6b68-4d85-a617-15fb772b7d14/settings.json
index d52c21a..82da3ad 100644
--- a/src/d44f3294-6b68-4d85-a617-15fb772b7d14/settings.json
+++ b/src/d44f3294-6b68-4d85-a617-15fb772b7d14/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d44f3294-6b68-4d85-a617-15fb772b7d14",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Interfaces.Creator.Fieldsetinterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fieldsetinterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Creator.Fieldsetinterface",
     "description": "Fieldset Creator Interface (needed for the container)\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/README.md b/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/README.md
index 5ad816b..f091c61 100644
--- a/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/README.md
+++ b/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/README.md
@@ -8,6 +8,7 @@
 ```
 # class Sql (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Sql  #Gold {
diff --git a/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/settings.json b/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/settings.json
index a6b74ac..4752bfe 100644
--- a/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/settings.json
+++ b/src/d4b418a7-bf9b-4768-969d-e07c36916fd2/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d4b418a7-bf9b-4768-969d-e07c36916fd2",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Sql",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Sql",
     "description": "Model Sql Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/code.php b/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/code.php
index 0a4ab78..62b5ac5 100644
--- a/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/code.php
+++ b/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/settings.json b/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/settings.json
index baeee72..2863e53 100644
--- a/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/settings.json
+++ b/src/d5530adf-c809-45a9-87fc-7cecd3d972d8/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.FieldGroupControl",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.FieldGroupControl",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.FieldGroupControl",
     "description": "Field Group Control Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d645881c-ae8c-4828-a217-6bad98cd3b44/code.php b/src/d645881c-ae8c-4828-a217-6bad98cd3b44/code.php
index 15eb792..00c6c9c 100644
--- a/src/d645881c-ae8c-4828-a217-6bad98cd3b44/code.php
+++ b/src/d645881c-ae8c-4828-a217-6bad98cd3b44/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/d645881c-ae8c-4828-a217-6bad98cd3b44/settings.json b/src/d645881c-ae8c-4828-a217-6bad98cd3b44/settings.json
index bdd5c26..741c0a0 100644
--- a/src/d645881c-ae8c-4828-a217-6bad98cd3b44/settings.json
+++ b/src/d645881c-ae8c-4828-a217-6bad98cd3b44/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.TabCounter",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.TabCounter",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.TabCounter",
     "description": "Tab Counter Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/README.md b/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/README.md
index 0a04929..7ad3638 100644
--- a/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/README.md
+++ b/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/README.md
@@ -8,6 +8,7 @@
 ```
 # interface LanguageInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces**
+> extends: ****
 ```uml
 @startuml
 interface LanguageInterface  #Lavender {
diff --git a/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/settings.json b/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/settings.json
index d7ed39f..f723a08 100644
--- a/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/settings.json
+++ b/src/d6592c9b-93a6-41b3-83c7-c43a0a80cb83/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d6592c9b-93a6-41b3-83c7-c43a0a80cb83",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.LanguageInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.LanguageInterface",
     "description": "Compiler Language Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/README.md b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/README.md
index ddf1210..cfa9b76 100644
--- a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/README.md
+++ b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/README.md
@@ -8,6 +8,7 @@
 ```
 # class Field (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: ****
 ```uml
 @startuml
 class Field  #Gold {
diff --git a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/code.php b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/code.php
index 65bcf4e..3133729 100644
--- a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/code.php
+++ b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Data;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name;
 use VDM\Joomla\Componentbuilder\Compiler\Field\TypeName;
diff --git a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/settings.json b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/settings.json
index a30f152..cfc7bbe 100644
--- a/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/settings.json
+++ b/src/d7ba2d5d-10b6-470d-978d-9f91ea65ee75/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d7ba2d5d-10b6-470d-978d-9f91ea65ee75",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field",
     "description": "Compiler Field\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/README.md b/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/README.md
index 02264b0..5c5cff5 100644
--- a/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/README.md
+++ b/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/README.md
@@ -8,6 +8,7 @@
 ```
 # final class ConfigFieldsetsEmailHelper (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class ConfigFieldsetsEmailHelper << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/settings.json b/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/settings.json
index 3d161d0..8aa421b 100644
--- a/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/settings.json
+++ b/src/d80e58b8-8462-47c4-9dcd-380445f1c64a/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "d80e58b8-8462-47c4-9dcd-380445f1c64a",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsEmailHelper",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.ConfigFieldsetsEmailHelper",
     "description": "Config Fieldsets Email Helper Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/code.php b/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/code.php
index 4ceaa4f..c1bf225 100644
--- a/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/code.php
+++ b/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/settings.json b/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/settings.json
index d5ff4dc..5fa765c 100644
--- a/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/settings.json
+++ b/src/d8e46d2c-d63e-4b92-80a2-d17638a7ae9e/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SelectionTranslation",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SelectionTranslation",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SelectionTranslation",
     "description": "Selection Translation Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/README.md b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/README.md
index 3e9ebdf..802412b 100644
--- a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/README.md
+++ b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/README.md
@@ -8,23 +8,15 @@
 ```
 # abstract class Factory (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler**
+> extends: **ExtendingFactory**
 ```uml
 @startuml
 abstract Factory  #Orange {
-  + {static} _(string $key) : mixed
   + {static} getKeys() : array
   + {static} _J(string $key) : mixed
-  + {static} getContainer() : Container
   # {static} createContainer() : Container
 }
 
-note right of Factory::_
-  Get any class from the compiler container
-
-  since: 3.2.0
-  return: mixed
-end note
-
 note right of Factory::getKeys
   Get array of all keys in container
 
@@ -39,13 +31,6 @@ note right of Factory::_J
   return: mixed
 end note
 
-note right of Factory::getContainer
-  Get the global compiler container
-
-  since: 3.2.0
-  return: Container
-end note
-
 note right of Factory::createContainer
   Create a container object
 
diff --git a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.php b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.php
index 2399b50..41613ad 100644
--- a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.php
+++ b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.php
@@ -13,9 +13,11 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
 use Joomla\DI\Container;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Crypt;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Server;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Database;
+use VDM\Joomla\Componentbuilder\Service\Crypt;
+use VDM\Joomla\Componentbuilder\Service\Server;
+use VDM\Joomla\Service\Database;
+use VDM\Joomla\Service\Model as BaseModel;
+use VDM\Joomla\Service\Data;
 use VDM\Joomla\Componentbuilder\Compiler\Service\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Service\Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Service\Event;
@@ -42,18 +44,19 @@ use VDM\Joomla\Componentbuilder\Compiler\Service\BuilderLZ;
 use VDM\Joomla\Componentbuilder\Compiler\Service\Creator;
 use VDM\Joomla\Componentbuilder\Compiler\Service\ArchitectureController;
 use VDM\Joomla\Componentbuilder\Compiler\Service\ArchitectureModel;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Service\Gitea;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Utilities as GiteaUtilities;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Settings as GiteaSettings;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Organization as GiteaOrg;
-use VastDevelopmentMethod\Joomla\Gitea\Service\User as GiteaUser;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Repository as GiteaRepo;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Package as GiteaPackage;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Issue as GiteaIssue;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Notifications as GiteNotifi;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Miscellaneous as GiteaMisc;
-use VastDevelopmentMethod\Joomla\Gitea\Service\Admin as GiteaAdmin;
-use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Componentbuilder\Service\Gitea;
+use VDM\Joomla\Gitea\Service\Utilities as GiteaUtilities;
+use VDM\Joomla\Gitea\Service\Settings as GiteaSettings;
+use VDM\Joomla\Gitea\Service\Organization as GiteaOrg;
+use VDM\Joomla\Gitea\Service\User as GiteaUser;
+use VDM\Joomla\Gitea\Service\Repository as GiteaRepo;
+use VDM\Joomla\Gitea\Service\Package as GiteaPackage;
+use VDM\Joomla\Gitea\Service\Issue as GiteaIssue;
+use VDM\Joomla\Gitea\Service\Notifications as GiteNotifi;
+use VDM\Joomla\Gitea\Service\Miscellaneous as GiteaMisc;
+use VDM\Joomla\Gitea\Service\Admin as GiteaAdmin;
+use VDM\Joomla\Interfaces\FactoryInterface;
+use VDM\Joomla\Abstraction\Factory as ExtendingFactory;
 
 
 /**
@@ -61,16 +64,8 @@ use VastDevelopmentMethod\Joomla\Interfaces\FactoryInterface;
  * 
  * @since 3.2.0
  */
-abstract class Factory implements FactoryInterface
+abstract class Factory extends ExtendingFactory implements FactoryInterface
 {
-	/**
-	 * Global Compiler Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static ?Container $container = null;
-
 	/**
 	 * Current Joomla Version Being Build
 	 *
@@ -79,19 +74,6 @@ abstract class Factory implements FactoryInterface
 	 **/
 	protected static int $JoomlaVersion;
 
-	/**
-	 * Get any class from the compiler container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
 	/**
 	 * Get array of all keys in container
 	 *
@@ -121,22 +103,6 @@ abstract class Factory implements FactoryInterface
 		return self::getContainer()->get('J' . self::$JoomlaVersion . '.' . $key);
 	}
 
-	/**
-	 * Get the global compiler container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -149,6 +115,8 @@ abstract class Factory implements FactoryInterface
 			->registerServiceProvider(new Crypt())
 			->registerServiceProvider(new Server())
 			->registerServiceProvider(new Database())
+			->registerServiceProvider(new BaseModel())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Model())
 			->registerServiceProvider(new Compiler())
 			->registerServiceProvider(new Event())
diff --git a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.power b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.power
index 879e31c..380fc20 100644
--- a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.power
+++ b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/code.power
@@ -1,11 +1,3 @@
-	/**
-	 * Global Compiler Container
-	 *
-	 * @var     Container
-	 * @since 3.2.0
-	 **/
-	protected static ?Container $container = null;
-
 	/**
 	 * Current Joomla Version Being Build
 	 *
@@ -14,19 +6,6 @@
 	 **/
 	protected static int $JoomlaVersion;
 
-	/**
-	 * Get any class from the compiler container
-	 *
-	 * @param   string  $key  The container class key
-	 *
-	 * @return  mixed
-	 * @since 3.2.0
-	 */
-	public static function _($key)
-	{
-		return self::getContainer()->get($key);
-	}
-
 	/**
 	 * Get array of all keys in container
 	 *
@@ -56,22 +35,6 @@
 		return self::getContainer()->get('J' . self::$JoomlaVersion . '.' . $key);
 	}
 
-	/**
-	 * Get the global compiler container
-	 *
-	 * @return  Container
-	 * @since 3.2.0
-	 */
-	public static function getContainer(): Container
-	{
-		if (!self::$container)
-		{
-			self::$container = self::createContainer();
-		}
-
-		return self::$container;
-	}
-
 	/**
 	 * Create a container object
 	 *
@@ -84,6 +47,8 @@
 			->registerServiceProvider(new Crypt())
 			->registerServiceProvider(new Server())
 			->registerServiceProvider(new Database())
+			->registerServiceProvider(new BaseModel())
+			->registerServiceProvider(new Data())
 			->registerServiceProvider(new Model())
 			->registerServiceProvider(new Compiler())
 			->registerServiceProvider(new Event())
diff --git a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/settings.json b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/settings.json
index 327aa18..1e7c541 100644
--- a/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/settings.json
+++ b/src/d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "2e5bf608-de5c-4b00-a20d-47c26aa350d9",
     "guid": "d910d8b8-4c23-4f3e-8cda-438f2d2bd7ac",
     "implements": [
         "caf33c5d-858c-4f9a-894f-ab302ec5445a"
@@ -25,155 +25,164 @@
             "as": "default"
         },
         "use_selection3": {
-            "use": "0601fee8-d51e-4af0-9ad3-b5f8700c4a45",
-            "as": "default"
+            "use": "2dcedd6c-c95b-4a37-9cac-95d28faedca3",
+            "as": "BaseModel"
         },
         "use_selection4": {
-            "use": "ea5ed06e-72ae-4906-9167-1cc0fa32fe69",
+            "use": "a5daf189-3345-4b13-8716-c51f686f545b",
             "as": "default"
         },
         "use_selection5": {
-            "use": "b94aaedb-6774-4739-a63f-8f87141a85db",
+            "use": "0601fee8-d51e-4af0-9ad3-b5f8700c4a45",
             "as": "default"
         },
         "use_selection6": {
-            "use": "36d49d4a-8d0e-435f-ab4c-8f247d96fd4d",
+            "use": "ea5ed06e-72ae-4906-9167-1cc0fa32fe69",
             "as": "default"
         },
         "use_selection7": {
-            "use": "63782f74-7b03-4745-aa40-0adf8ed4e704",
+            "use": "b94aaedb-6774-4739-a63f-8f87141a85db",
             "as": "default"
         },
         "use_selection8": {
-            "use": "9f00e793-86f8-4ef9-b775-a3eb129f83c0",
+            "use": "36d49d4a-8d0e-435f-ab4c-8f247d96fd4d",
             "as": "default"
         },
         "use_selection9": {
-            "use": "2f7b1998-bb93-4055-ae82-aa659ce8a37f",
+            "use": "63782f74-7b03-4745-aa40-0adf8ed4e704",
             "as": "default"
         },
         "use_selection10": {
-            "use": "a74ac3b7-bb79-4639-8f14-54a8021be68b",
+            "use": "9f00e793-86f8-4ef9-b775-a3eb129f83c0",
             "as": "default"
         },
         "use_selection11": {
-            "use": "de01527a-6586-46ea-92e7-11ea3de1cedb",
-            "as": "default"
-        },
-        "use_selection39": {
-            "use": "5716c79f-a1c9-4059-9d00-8cccb9f9e061",
+            "use": "2f7b1998-bb93-4055-ae82-aa659ce8a37f",
             "as": "default"
         },
         "use_selection12": {
-            "use": "8a63e87b-b39b-4a15-8044-9b2a2f4fb61c",
+            "use": "a74ac3b7-bb79-4639-8f14-54a8021be68b",
             "as": "default"
         },
         "use_selection13": {
-            "use": "2dd1289a-4000-43cc-8c62-77ff32de56bf",
+            "use": "de01527a-6586-46ea-92e7-11ea3de1cedb",
             "as": "default"
         },
         "use_selection14": {
-            "use": "253317c7-3c3b-48a0-aec8-8af5e7a86504",
+            "use": "5716c79f-a1c9-4059-9d00-8cccb9f9e061",
             "as": "default"
         },
         "use_selection15": {
-            "use": "87faa133-4cac-4816-ae41-5c3f9a2f76aa",
+            "use": "8a63e87b-b39b-4a15-8044-9b2a2f4fb61c",
             "as": "default"
         },
         "use_selection16": {
-            "use": "fff3255d-c493-4c21-a48f-73b3ebf8ba05",
+            "use": "2dd1289a-4000-43cc-8c62-77ff32de56bf",
             "as": "default"
         },
         "use_selection17": {
-            "use": "ed9591cb-0a03-400a-bf47-eaf78ab19b9d",
+            "use": "253317c7-3c3b-48a0-aec8-8af5e7a86504",
             "as": "default"
         },
         "use_selection18": {
-            "use": "f65b52c2-593a-4c35-89d1-4a8e57a1adf0",
+            "use": "87faa133-4cac-4816-ae41-5c3f9a2f76aa",
             "as": "default"
         },
         "use_selection19": {
-            "use": "c6c30d66-3106-44eb-9272-b2cf7ec74613",
+            "use": "fff3255d-c493-4c21-a48f-73b3ebf8ba05",
             "as": "default"
         },
         "use_selection20": {
-            "use": "295186de-5954-4a65-a4c1-2f79ef305743",
+            "use": "ed9591cb-0a03-400a-bf47-eaf78ab19b9d",
             "as": "default"
         },
         "use_selection21": {
-            "use": "9eba241c-af90-42dd-ae05-92ff4d8391d3",
+            "use": "f65b52c2-593a-4c35-89d1-4a8e57a1adf0",
             "as": "default"
         },
         "use_selection22": {
-            "use": "516f93b8-5fff-41c6-aeaf-2d93180a12cc",
+            "use": "c6c30d66-3106-44eb-9272-b2cf7ec74613",
             "as": "default"
         },
         "use_selection23": {
-            "use": "c7230c8c-ea88-4d8d-8c53-6136133195b7",
+            "use": "295186de-5954-4a65-a4c1-2f79ef305743",
             "as": "default"
         },
         "use_selection24": {
-            "use": "2c76c06e-a371-4b73-9fbe-b4d9b4df55d7",
+            "use": "9eba241c-af90-42dd-ae05-92ff4d8391d3",
             "as": "default"
         },
         "use_selection25": {
-            "use": "8fdd604f-53e7-4a91-9935-afcfd2f6ac1b",
+            "use": "516f93b8-5fff-41c6-aeaf-2d93180a12cc",
             "as": "default"
         },
         "use_selection26": {
-            "use": "56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60",
+            "use": "c7230c8c-ea88-4d8d-8c53-6136133195b7",
             "as": "default"
         },
         "use_selection27": {
-            "use": "bbd36fbf-d905-47e8-8e67-9ea6ec734712",
+            "use": "2c76c06e-a371-4b73-9fbe-b4d9b4df55d7",
             "as": "default"
         },
         "use_selection28": {
-            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "use": "8fdd604f-53e7-4a91-9935-afcfd2f6ac1b",
             "as": "default"
         },
         "use_selection29": {
+            "use": "56ba30f5-a5c4-4c4c-be6f-a56f7f9cbc60",
+            "as": "default"
+        },
+        "use_selection30": {
+            "use": "bbd36fbf-d905-47e8-8e67-9ea6ec734712",
+            "as": "default"
+        },
+        "use_selection31": {
+            "use": "71acf8d6-32b8-4173-8277-eb9cda29fd64",
+            "as": "default"
+        },
+        "use_selection32": {
             "use": "6edf0cf3-c2b0-45c9-84d2-c6ef1c5d434c",
             "as": "GiteaUtilities"
         },
-        "use_selection30": {
+        "use_selection33": {
             "use": "f4d00907-c94a-49b7-8727-d64c1fa74cf5",
             "as": "GiteaSettings"
         },
-        "use_selection31": {
+        "use_selection34": {
             "use": "3d25ea99-4f33-489a-934c-0e42027e6114",
             "as": "GiteaOrg"
         },
-        "use_selection32": {
+        "use_selection35": {
             "use": "0a69cfc5-3223-4afb-8c9a-75f4bacf3c0e",
             "as": "GiteaUser"
         },
-        "use_selection33": {
+        "use_selection36": {
             "use": "0bb2b72f-ebcd-46fe-844b-ac5fe715c230",
             "as": "GiteaRepo"
         },
-        "use_selection34": {
+        "use_selection37": {
             "use": "808da4eb-b467-46cf-a767-e7e714f46b5a",
             "as": "GiteaPackage"
         },
-        "use_selection35": {
+        "use_selection38": {
             "use": "44396eb8-e14c-47d9-9bdc-8205c0fd2bba",
             "as": "GiteaIssue"
         },
-        "use_selection36": {
+        "use_selection39": {
             "use": "be57f70f-1214-4d69-8d33-7cd4e312ff70",
             "as": "GiteNotifi"
         },
-        "use_selection37": {
+        "use_selection40": {
             "use": "012af7d0-3436-4cae-b856-be49bdc39a3e",
             "as": "GiteaMisc"
         },
-        "use_selection38": {
+        "use_selection41": {
             "use": "ddced4c5-667d-4559-873d-d716c17fd85b",
             "as": "GiteaAdmin"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Factory",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Factory",
     "description": "Compiler Factory\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\DI\\Container;",
diff --git a/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/code.php b/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/code.php
index 2c3c4f3..30413a3 100644
--- a/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/code.php
+++ b/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/settings.json b/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/settings.json
index 8702ba5..72ba8e8 100644
--- a/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/settings.json
+++ b/src/dba0776e-e582-4f73-af3e-e7ed17bc34b3/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.FootableScripts",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.FootableScripts",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.FootableScripts",
     "description": "Footable Scripts Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/README.md b/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/README.md
index 0ff538f..477cb05 100644
--- a/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/README.md
+++ b/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowEdit (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFour\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowEdit << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/settings.json b/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/settings.json
index 0f4269f..79e1f61 100644
--- a/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/settings.json
+++ b/src/ddf31f4b-96ba-46e7-8100-f48e1cefe533/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ddf31f4b-96ba-46e7-8100-f48e1cefe533",
     "implements": [
         "992a842f-1ba9-4a5c-b214-042459ffe038"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Controller.AllowEdit",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFour.Controller.AllowEdit",
     "description": "Controller Allow Edit Class for Joomla 4\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/README.md b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/README.md
index cfd1d8b..9e7b79b 100644
--- a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/README.md
+++ b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/README.md
@@ -8,6 +8,7 @@
 ```
 # class Power (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Power  #Gold {
@@ -24,9 +25,6 @@ class Power  #Gold {
   + getReposReadme(Container $container) : ReposReadme
   + getExtractor(Container $container) : Extractor
   + getInjector(Container $container) : Injector
-  + getModelUpsert(Container $container) : Upsert
-  + getInsert(Container $container) : Insert
-  + getUpdate(Container $container) : Update
 }
 
 note right of Power::register
@@ -37,109 +35,88 @@ note right of Power::register
 end note
 
 note left of Power::getPowers
-  Get the Powers
+  Get The Power Class.
 
   since: 3.2.0
   return: Powers
 end note
 
 note right of Power::getSuperpower
-  Get the Superpower
+  Get The Super Class.
 
   since: 3.2.0
   return: Superpower
 end note
 
 note left of Power::getGrep
-  Get the Grep
+  Get The Grep Class.
 
   since: 3.2.0
   return: Grep
 end note
 
 note right of Power::getAutoloader
-  Get the Compiler Autoloader
+  Get The Autoloader Class.
 
   since: 3.2.0
   return: Autoloader
 end note
 
 note left of Power::getInfusion
-  Get the Compiler Power Infusion
+  Get The Infusion Class.
 
   since: 3.2.0
   return: Infusion
 end note
 
 note right of Power::getStructure
-  Get the Compiler Power Structure Builder
+  Get The Structure Class.
 
   since: 3.2.0
   return: Structure
 end note
 
 note left of Power::getParser
-  Get the Compiler Power Parser
+  Get The Parser Class.
 
   since: 3.2.0
   return: Parser
 end note
 
 note right of Power::getPlantuml
-  Get the Compiler Power Plantuml Builder
+  Get The Plantuml Class.
 
   since: 3.2.0
   return: Plantuml
 end note
 
 note left of Power::getRepoReadme
-  Get the Compiler Power Repo Readme Builder
+  Get The Readme Class.
 
   since: 3.2.0
   return: RepoReadme
 end note
 
 note right of Power::getReposReadme
-  Get the Compiler Power Repos Readme Builder
+  Get The Readme Class.
 
   since: 3.2.0
   return: ReposReadme
 end note
 
 note left of Power::getExtractor
-  Get the Compiler Power Extractor
+  Get The Extractor Class.
 
   since: 3.2.0
   return: Extractor
 end note
 
 note right of Power::getInjector
-  Get the Compiler Power Injector
+  Get The Injector Class.
 
   since: 3.2.0
   return: Injector
 end note
-
-note left of Power::getModelUpsert
-  Get the Power Model Upsert
-
-  since: 3.2.0
-  return: Upsert
-end note
-
-note right of Power::getInsert
-  Get the Power Insert
-
-  since: 3.2.0
-  return: Insert
-end note
-
-note left of Power::getUpdate
-  Get the Power Update
-
-  since: 3.2.0
-  return: Update
-end note
  
 @enduml
 ```
diff --git a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.php b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.php
index 845ce40..958e6c2 100644
--- a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.php
+++ b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.php
@@ -15,10 +15,10 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Service;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Power as Powers;
-use VDM\Joomla\Componentbuilder\Power\Grep;
 use VDM\Joomla\Componentbuilder\Power\Super as Superpower;
-use VDM\Joomla\Componentbuilder\Compiler\Power\Infusion;
+use VDM\Joomla\Componentbuilder\Power\Grep;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Autoloader;
+use VDM\Joomla\Componentbuilder\Compiler\Power\Infusion;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Structure;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Parser;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Plantuml;
@@ -26,9 +26,6 @@ use VDM\Joomla\Componentbuilder\Compiler\Power\Repo\Readme as RepoReadme;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Repos\Readme as ReposReadme;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Extractor;
 use VDM\Joomla\Componentbuilder\Compiler\Power\Injector;
-use VDM\Joomla\Componentbuilder\Power\Model\Upsert;
-use VDM\Joomla\Componentbuilder\Power\Database\Insert;
-use VDM\Joomla\Componentbuilder\Power\Database\Update;
 
 
 /**
@@ -83,19 +80,10 @@ class Power implements ServiceProviderInterface
 
 		$container->alias(Injector::class, 'Power.Injector')
 			->share('Power.Injector', [$this, 'getInjector'], true);
-
-		$container->alias(Upsert::class, 'Power.Model.Upsert')
-			->share('Power.Model.Upsert', [$this, 'getModelUpsert'], true);
-
-		$container->alias(Insert::class, 'Power.Insert')
-			->share('Power.Insert', [$this, 'getInsert'], true);
-
-		$container->alias(Update::class, 'Power.Update')
-			->share('Power.Update', [$this, 'getUpdate'], true);
 	}
 
 	/**
-	 * Get the Powers
+	 * Get The Power Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -108,12 +96,13 @@ class Power implements ServiceProviderInterface
 			$container->get('Config'),
 			$container->get('Placeholder'),
 			$container->get('Customcode'),
-			$container->get('Customcode.Gui')
+			$container->get('Customcode.Gui'),
+			$container->get('Superpower')
 		);
 	}
 
 	/**
-	 * Get the Superpower
+	 * Get The Super Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -124,13 +113,12 @@ class Power implements ServiceProviderInterface
 	{
 		return new Superpower(
 			$container->get('Power.Grep'),
-			$container->get('Power.Insert'),
-			$container->get('Power.Update')
+			$container->get('Data.Item')
 		);
 	}
 
 	/**
-	 * Get the Grep
+	 * Get The Grep Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -140,14 +128,14 @@ class Power implements ServiceProviderInterface
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_powers_repository_path,
+			$container->get('Gitea.Repository.Contents'),
 			$container->get('Config')->approved_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Config')->local_powers_repository_path
 		);
 	}
 
 	/**
-	 * Get the Compiler Autoloader
+	 * Get The Autoloader Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -164,7 +152,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Infusion
+	 * Get The Infusion Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -187,7 +175,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Structure Builder
+	 * Get The Structure Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -210,11 +198,11 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Parser
+	 * Get The Parser Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  Structure
+	 * @return  Parser
 	 * @since 3.2.0
 	 */
 	public function getParser(Container $container): Parser
@@ -223,7 +211,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Plantuml Builder
+	 * Get The Plantuml Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -236,7 +224,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Repo Readme Builder
+	 * Get The Readme Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -252,7 +240,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Repos Readme Builder
+	 * Get The Readme Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -268,7 +256,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Extractor
+	 * Get The Extractor Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -281,7 +269,7 @@ class Power implements ServiceProviderInterface
 	}
 
 	/**
-	 * Get the Compiler Power Injector
+	 * Get The Injector Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -296,53 +284,6 @@ class Power implements ServiceProviderInterface
 			$container->get('Power.Parser'),
 			$container->get('Placeholder')
 		);
-	}
-
-	/**
-	 * Get the Power Model Upsert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Upsert
-	 * @since 3.2.0
-	 */
-	public function getModelUpsert(Container $container): Upsert
-	{
-		return new Upsert(
-			$container->get('Table')
-		);
-	}
-
-	/**
-	 * Get the Power Insert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Insert
-	 * @since 3.2.0
-	 */
-	public function getInsert(Container $container): Insert
-	{
-		return new Insert(
-			$container->get('Power.Model.Upsert'),
-			$container->get('Insert')
-		);
-	}
-
-	/**
-	 * Get the Power Update
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Update
-	 * @since 3.2.0
-	 */
-	public function getUpdate(Container $container): Update
-	{
-		return new Update(
-			$container->get('Power.Model.Upsert'),
-			$container->get('Update')
-		);
 	}
 }
 
diff --git a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.power b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.power
index 4bd4d29..1fa1798 100644
--- a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.power
+++ b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/code.power
@@ -43,19 +43,10 @@
 
 		$container->alias(Injector::class, 'Power.Injector')
 			->share('Power.Injector', [$this, 'getInjector'], true);
-
-		$container->alias(Upsert::class, 'Power.Model.Upsert')
-			->share('Power.Model.Upsert', [$this, 'getModelUpsert'], true);
-
-		$container->alias(Insert::class, 'Power.Insert')
-			->share('Power.Insert', [$this, 'getInsert'], true);
-
-		$container->alias(Update::class, 'Power.Update')
-			->share('Power.Update', [$this, 'getUpdate'], true);
 	}
 
 	/**
-	 * Get the Powers
+	 * Get The Power Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -68,12 +59,13 @@
 			$container->get('Config'),
 			$container->get('Placeholder'),
 			$container->get('Customcode'),
-			$container->get('Customcode.Gui')
+			$container->get('Customcode.Gui'),
+			$container->get('Superpower')
 		);
 	}
 
 	/**
-	 * Get the Superpower
+	 * Get The Super Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -84,13 +76,12 @@
 	{
 		return new Superpower(
 			$container->get('Power.Grep'),
-			$container->get('Power.Insert'),
-			$container->get('Power.Update')
+			$container->get('Data.Item')
 		);
 	}
 
 	/**
-	 * Get the Grep
+	 * Get The Grep Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -100,14 +91,14 @@
 	public function getGrep(Container $container): Grep
 	{
 		return new Grep(
-			$container->get('Config')->local_powers_repository_path,
+			$container->get('Gitea.Repository.Contents'),
 			$container->get('Config')->approved_paths,
-			$container->get('Gitea.Repository.Contents')
+			$container->get('Config')->local_powers_repository_path
 		);
 	}
 
 	/**
-	 * Get the Compiler Autoloader
+	 * Get The Autoloader Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -124,7 +115,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Infusion
+	 * Get The Infusion Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -147,7 +138,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Structure Builder
+	 * Get The Structure Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -170,11 +161,11 @@
 	}
 
 	/**
-	 * Get the Compiler Power Parser
+	 * Get The Parser Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
-	 * @return  Structure
+	 * @return  Parser
 	 * @since 3.2.0
 	 */
 	public function getParser(Container $container): Parser
@@ -183,7 +174,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Plantuml Builder
+	 * Get The Plantuml Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -196,7 +187,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Repo Readme Builder
+	 * Get The Readme Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -212,7 +203,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Repos Readme Builder
+	 * Get The Readme Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -228,7 +219,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Extractor
+	 * Get The Extractor Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -241,7 +232,7 @@
 	}
 
 	/**
-	 * Get the Compiler Power Injector
+	 * Get The Injector Class.
 	 *
 	 * @param   Container  $container  The DI container.
 	 *
@@ -256,51 +247,4 @@
 			$container->get('Power.Parser'),
 			$container->get('Placeholder')
 		);
-	}
-
-	/**
-	 * Get the Power Model Upsert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Upsert
-	 * @since 3.2.0
-	 */
-	public function getModelUpsert(Container $container): Upsert
-	{
-		return new Upsert(
-			$container->get('Table')
-		);
-	}
-
-	/**
-	 * Get the Power Insert
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Insert
-	 * @since 3.2.0
-	 */
-	public function getInsert(Container $container): Insert
-	{
-		return new Insert(
-			$container->get('Power.Model.Upsert'),
-			$container->get('Insert')
-		);
-	}
-
-	/**
-	 * Get the Power Update
-	 *
-	 * @param   Container  $container  The DI container.
-	 *
-	 * @return  Update
-	 * @since 3.2.0
-	 */
-	public function getUpdate(Container $container): Update
-	{
-		return new Update(
-			$container->get('Power.Model.Upsert'),
-			$container->get('Update')
-		);
 	}
\ No newline at end of file
diff --git a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/settings.json b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/settings.json
index 97cffe9..93e8b2f 100644
--- a/src/de01527a-6586-46ea-92e7-11ea3de1cedb/settings.json
+++ b/src/de01527a-6586-46ea-92e7-11ea3de1cedb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "de01527a-6586-46ea-92e7-11ea3de1cedb",
     "implements": [
         "-1"
@@ -17,19 +17,19 @@
             "as": "Powers"
         },
         "use_selection1": {
-            "use": "6784dd52-0909-451a-a872-9a942a023c68",
-            "as": "default"
-        },
-        "use_selection2": {
             "use": "3ab0eba9-f37b-4b37-aec1-2e78067f2aff",
             "as": "Superpower"
         },
+        "use_selection2": {
+            "use": "6784dd52-0909-451a-a872-9a942a023c68",
+            "as": "default"
+        },
         "use_selection3": {
-            "use": "0419081e-4cb3-4c65-8c6a-ffe941fb0f1c",
+            "use": "6e64917c-d687-4ef3-a655-811319f5a81e",
             "as": "default"
         },
         "use_selection4": {
-            "use": "6e64917c-d687-4ef3-a655-811319f5a81e",
+            "use": "0419081e-4cb3-4c65-8c6a-ffe941fb0f1c",
             "as": "default"
         },
         "use_selection5": {
@@ -59,21 +59,10 @@
         "use_selection11": {
             "use": "763d137c-42bc-4282-98d8-cc5c0654985f",
             "as": "default"
-        },
-        "use_selection12": {
-            "use": "7c1fb50f-8fb1-4627-8705-6fedf7182ca5",
-            "as": "default"
-        },
-        "use_selection13": {
-            "use": "380bb7a3-cdcc-4336-a699-5070cbf521a5",
-            "as": "default"
-        },
-        "use_selection14": {
-            "use": "e543c123-b1d9-4a0b-83b2-a9d371da5ff3",
-            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Power",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Service.Power",
     "description": "Compiler Power Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/README.md b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/README.md
index 1c30da5..a58866e 100644
--- a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/README.md
+++ b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Javascriptadminview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Javascriptadminview  #Gold {
diff --git a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/code.php b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/code.php
index e1bf5c3..f6df062 100644
--- a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/code.php
+++ b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/settings.json b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/settings.json
index bc47de0..236551f 100644
--- a/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/settings.json
+++ b/src/dfd3c893-0296-46eb-9ae4-a0348713cd8f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "dfd3c893-0296-46eb-9ae4-a0348713cd8f",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Javascriptadminview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Javascriptadminview",
     "description": "Model Admin View Javascript Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e0075978-315d-4807-8507-ce9c6922a885/README.md b/src/e0075978-315d-4807-8507-ce9c6922a885/README.md
index 5457968..244f169 100644
--- a/src/e0075978-315d-4807-8507-ce9c6922a885/README.md
+++ b/src/e0075978-315d-4807-8507-ce9c6922a885/README.md
@@ -8,6 +8,7 @@
 ```
 # class Siteviews (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Siteviews  #Gold {
diff --git a/src/e0075978-315d-4807-8507-ce9c6922a885/code.php b/src/e0075978-315d-4807-8507-ce9c6922a885/code.php
index 059f5c6..e60e763 100644
--- a/src/e0075978-315d-4807-8507-ce9c6922a885/code.php
+++ b/src/e0075978-315d-4807-8507-ce9c6922a885/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customview\Data as Customview;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/e0075978-315d-4807-8507-ce9c6922a885/settings.json b/src/e0075978-315d-4807-8507-ce9c6922a885/settings.json
index 59a52b0..020b575 100644
--- a/src/e0075978-315d-4807-8507-ce9c6922a885/settings.json
+++ b/src/e0075978-315d-4807-8507-ce9c6922a885/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e0075978-315d-4807-8507-ce9c6922a885",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Siteviews",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Siteviews",
     "description": "Model Site Views Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/README.md b/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/README.md
index 83079c0..2dc7d1d 100644
--- a/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/README.md
+++ b/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CanDeleteInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Architecture\Model**
+> extends: ****
 ```uml
 @startuml
 interface CanDeleteInterface  #Lavender {
diff --git a/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/settings.json b/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/settings.json
index f5fca28..4bf0faa 100644
--- a/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/settings.json
+++ b/src/e00a7d1d-6d80-41c5-bf13-32d41bc5bf91/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e00a7d1d-6d80-41c5-bf13-32d41bc5bf91",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Architecture.Model.CanDelete",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Model.CanDeleteInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Architecture.Model.CanDeleteInterface",
     "description": "Model Can Delete Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e046b530-47fe-406f-b45a-b5eec8cbb238/code.php b/src/e046b530-47fe-406f-b45a-b5eec8cbb238/code.php
index 6616fc7..ac3c8c4 100644
--- a/src/e046b530-47fe-406f-b45a-b5eec8cbb238/code.php
+++ b/src/e046b530-47fe-406f-b45a-b5eec8cbb238/code.php
@@ -12,11 +12,11 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\VarExport;
+use VDM\Joomla\Abstraction\Registry\Traits\VarExport;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Line;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e046b530-47fe-406f-b45a-b5eec8cbb238/settings.json b/src/e046b530-47fe-406f-b45a-b5eec8cbb238/settings.json
index 7506ec9..6028b84 100644
--- a/src/e046b530-47fe-406f-b45a-b5eec8cbb238/settings.json
+++ b/src/e046b530-47fe-406f-b45a-b5eec8cbb238/settings.json
@@ -25,7 +25,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.PermissionDashboard",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.PermissionDashboard",
     "description": "Permission Dashboard Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e0c8c931-52a0-4171-9909-e8769505bb1f/README.md b/src/e0c8c931-52a0-4171-9909-e8769505bb1f/README.md
index 6df0da3..5669782 100644
--- a/src/e0c8c931-52a0-4171-9909-e8769505bb1f/README.md
+++ b/src/e0c8c931-52a0-4171-9909-e8769505bb1f/README.md
@@ -8,6 +8,7 @@
 ```
 # class Constantpaths (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Constantpaths  #Gold {
diff --git a/src/e0c8c931-52a0-4171-9909-e8769505bb1f/settings.json b/src/e0c8c931-52a0-4171-9909-e8769505bb1f/settings.json
index 355ddd6..406d610 100644
--- a/src/e0c8c931-52a0-4171-9909-e8769505bb1f/settings.json
+++ b/src/e0c8c931-52a0-4171-9909-e8769505bb1f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e0c8c931-52a0-4171-9909-e8769505bb1f",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Utilities.Constantpaths",
     "type": "class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Utilities.Constantpaths",
     "description": "Utilities Constant Paths\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/e0e24173-a808-4dd5-8e26-de971d014f86/README.md b/src/e0e24173-a808-4dd5-8e26-de971d014f86/README.md
index 2fe821a..9c3dfff 100644
--- a/src/e0e24173-a808-4dd5-8e26-de971d014f86/README.md
+++ b/src/e0e24173-a808-4dd5-8e26-de971d014f86/README.md
@@ -8,6 +8,7 @@
 ```
 # class Customadminviews (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Customadminviews  #Gold {
diff --git a/src/e0e24173-a808-4dd5-8e26-de971d014f86/code.php b/src/e0e24173-a808-4dd5-8e26-de971d014f86/code.php
index 48ce1bd..6913435 100644
--- a/src/e0e24173-a808-4dd5-8e26-de971d014f86/code.php
+++ b/src/e0e24173-a808-4dd5-8e26-de971d014f86/code.php
@@ -15,9 +15,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customview\Data as Customview;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/e0e24173-a808-4dd5-8e26-de971d014f86/settings.json b/src/e0e24173-a808-4dd5-8e26-de971d014f86/settings.json
index 849ef72..144194e 100644
--- a/src/e0e24173-a808-4dd5-8e26-de971d014f86/settings.json
+++ b/src/e0e24173-a808-4dd5-8e26-de971d014f86/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e0e24173-a808-4dd5-8e26-de971d014f86",
     "implements": null,
     "load_selection": null,
@@ -35,7 +35,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Customadminviews",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Customadminviews",
     "description": "Model Custom Admin Views Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/code.php b/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/code.php
index 13170fb..687450c 100644
--- a/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/code.php
+++ b/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Component\Data;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Abstraction\BaseRegistry;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseRegistry;
 
 
 /**
diff --git a/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/settings.json b/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/settings.json
index 807f506..3c246cb 100644
--- a/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/settings.json
+++ b/src/e2472b22-a329-44d8-b4a2-ae3ba99e17a0/settings.json
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component",
     "description": "Compiler Component\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/README.md b/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/README.md
index a909391..416e3a9 100644
--- a/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/README.md
+++ b/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CoreFieldInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field**
+> extends: ****
 ```uml
 @startuml
 interface CoreFieldInterface  #Lavender {
diff --git a/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/settings.json b/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/settings.json
index ea5c126..c832aa7 100644
--- a/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/settings.json
+++ b/src/e2f5fddf-cbc8-44ee-836c-7f3fb08d8900/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e2f5fddf-cbc8-44ee-836c-7f3fb08d8900",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Interfaces.Field.CoreFieldInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Field.CoreFieldInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Field.CoreFieldInterface",
     "description": "Field Joomla Core Field Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e38a5276-6664-4bc6-8002-0562fcc248f8/code.php b/src/e38a5276-6664-4bc6-8002-0562fcc248f8/code.php
index 53322fb..00dbac5 100644
--- a/src/e38a5276-6664-4bc6-8002-0562fcc248f8/code.php
+++ b/src/e38a5276-6664-4bc6-8002-0562fcc248f8/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e38a5276-6664-4bc6-8002-0562fcc248f8/settings.json b/src/e38a5276-6664-4bc6-8002-0562fcc248f8/settings.json
index 58e7892..c037b68 100644
--- a/src/e38a5276-6664-4bc6-8002-0562fcc248f8/settings.json
+++ b/src/e38a5276-6664-4bc6-8002-0562fcc248f8/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.AccessSwitch",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.AccessSwitch",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.AccessSwitch",
     "description": "Access Switch Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/code.php b/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/code.php
index 2afdfdb..17eac8a 100644
--- a/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/code.php
+++ b/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/settings.json b/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/settings.json
index d0bd6fa..2f2ba5c 100644
--- a/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/settings.json
+++ b/src/e4e65c5b-00ec-439c-96bf-3153c3a73398/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Filter",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Filter",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Filter",
     "description": "Filter Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/README.md b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/README.md
index 86dab16..5c2141e 100644
--- a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/README.md
+++ b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/README.md
@@ -8,6 +8,7 @@
 ```
 # class Sqltweaking (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Sqltweaking  #Gold {
diff --git a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/code.php b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/code.php
index a14d2f1..960f607 100644
--- a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/code.php
+++ b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/code.php
@@ -14,9 +14,9 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/settings.json b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/settings.json
index ad59503..c4aa79c 100644
--- a/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/settings.json
+++ b/src/e50cbac5-9c9d-4fd4-aa7a-5e830719ed26/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e50cbac5-9c9d-4fd4-aa7a-5e830719ed26",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Sqltweaking",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Sqltweaking",
     "description": "Model Sql Tweaking Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/README.md b/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/README.md
index 5e780c7..621ed88 100644
--- a/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/README.md
+++ b/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/README.md
@@ -8,6 +8,7 @@
 ```
 # final class RouterConstructorDefault (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class RouterConstructorDefault << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/settings.json b/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/settings.json
index 5e4ce59..aa437a6 100644
--- a/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/settings.json
+++ b/src/e5278bf3-6dfb-42a0-b699-148b5ab8e45f/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e5278bf3-6dfb-42a0-b699-148b5ab8e45f",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.RouterConstructorDefault",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.RouterConstructorDefault",
     "description": "Router Constructor Default Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/README.md b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/README.md
index 3f95c4e..58cad78 100644
--- a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/README.md
+++ b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/README.md
@@ -6,73 +6,14 @@
 ██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
 ╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
 ```
-# class Update (Details)
-> namespace: **VDM\Joomla\Componentbuilder\Power\Database**
+# final class Update (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Power\Data**
+> extends: **ExtendingUpdate**
 ```uml
 @startuml
-class Update  #Gold {
-  # Model $model
-  # Database $database
+class Update << (F,LightGreen) >> #RoyalBlue {
   # string $table
-  + __construct(Model $model, Database $database)
-  + value(mixed $value, string $field, ...) : bool
-  + row(array $item) : bool
-  + rows(?array $items) : bool
-  + item(object $item) : bool
-  + items(?array $items) : bool
 }
-
-note right of Update::__construct
-  Constructor
-
-  since: 3.2.0
-end note
-
-note right of Update::value
-  Update a value to a given table
-Example: $this->value(Value, 'value_key', 'GUID');
-
-  since: 3.2.0
-  return: bool
-  
-  arguments:
-    mixed $value
-    string $field
-    string $keyValue
-    string $key = 'guid'
-end note
-
-note right of Update::row
-  Update single row with multiple values to a given table
-Example: $this->item(Array);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Update::rows
-  Update multiple rows to a given table
-Example: $this->items(Array);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Update::item
-  Update single item with multiple values to a given table
-Example: $this->item(Object);
-
-  since: 3.2.0
-  return: bool
-end note
-
-note right of Update::items
-  Update multiple items to a given table
-Example: $this->items(Array);
-
-  since: 3.2.0
-  return: bool
-end note
  
 @enduml
 ```
diff --git a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.php b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.php
index 42ff828..233701f 100644
--- a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.php
+++ b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.php
@@ -9,160 +9,26 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-namespace VDM\Joomla\Componentbuilder\Power\Database;
+namespace VDM\Joomla\Componentbuilder\Power\Data;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\ModelInterface as Model;
-use VastDevelopmentMethod\Joomla\Database\Update as Database;
-use VDM\Joomla\Componentbuilder\Interfaces\Database\UpdateInterface;
+use VDM\Joomla\Interfaces\Data\UpdateInterface;
+use VDM\Joomla\Abstraction\Data\Update as ExtendingUpdate;
 
 
 /**
- * Power Database Update
+ * Power Data Update (GUID)
  * 
- * @since 3.2.0
+ * @since 3.2.2
  */
-class Update implements UpdateInterface
+final class Update extends ExtendingUpdate implements UpdateInterface
 {
-	/**
-	 * Model
-	 *
-	 * @var    Model
-	 * @since 3.2.0
-	 */
-	protected Model $model;
-
-	/**
-	 * Database
-	 *
-	 * @var    Database
-	 * @since 3.2.0
-	 */
-	protected Database $database;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Model       $model       The set model object.
-	 * @param Database    $database    The update database object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Model $model, Database $database)
-	{
-		$this->model = $model;
-		$this->database = $database;
-	}
-
-	/**
-	 * Update a value to a given table
-	 *          Example: $this->value(Value, 'value_key', 'GUID');
-	 *
-	 * @param   mixed     $value      The field value
-	 * @param   string    $field      The field key
-	 * @param   string    $keyValue   The key value
-	 * @param   string    $key        The key name
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function value($value, string $field, string $keyValue, string $key = 'guid'): bool
-	{
-		// build the array
-		$item = [];
-		$item[$key] = $keyValue;
-		$item[$field] = $value;
-
-		// Update the column of this table using guid as the primary key.
-		return $this->row($item);
-	}
-
-	/**
-	 * Update single row with multiple values to a given table
-	 *          Example: $this->item(Array);
-	 *
-	 * @param   array    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function row(array $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->row($item, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->row($item, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update multiple rows to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of arrays)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function rows(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->rows($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->rows($items, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update single item with multiple values to a given table
-	 *          Example: $this->item(Object);
-	 *
-	 * @param   object    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function item(object $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->item($item, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->item($item, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update multiple items to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of objects)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function items(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->items($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->items($items, 'guid', $this->table);
-		}
-		return false;
-	}
+	protected string $table = 'power';
 }
 
diff --git a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.power b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.power
index f5b7871..e2209eb 100644
--- a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.power
+++ b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/code.power
@@ -1,140 +1,7 @@
-	/**
-	 * Model
-	 *
-	 * @var    Model
-	 * @since 3.2.0
-	 */
-	protected Model $model;
-
-	/**
-	 * Database
-	 *
-	 * @var    Database
-	 * @since 3.2.0
-	 */
-	protected Database $database;
-
 	/**
 	 * Table Name
 	 *
 	 * @var    string
 	 * @since 3.2.1
 	 */
-	protected string $table = 'power';
-
-	/**
-	 * Constructor
-	 *
-	 * @param Model       $model       The set model object.
-	 * @param Database    $database    The update database object.
-	 *
-	 * @since 3.2.0
-	 */
-	public function __construct(Model $model, Database $database)
-	{
-		$this->model = $model;
-		$this->database = $database;
-	}
-
-	/**
-	 * Update a value to a given table
-	 *          Example: $this->value(Value, 'value_key', 'GUID');
-	 *
-	 * @param   mixed     $value      The field value
-	 * @param   string    $field      The field key
-	 * @param   string    $keyValue   The key value
-	 * @param   string    $key        The key name
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function value($value, string $field, string $keyValue, string $key = 'guid'): bool
-	{
-		// build the array
-		$item = [];
-		$item[$key] = $keyValue;
-		$item[$field] = $value;
-
-		// Update the column of this table using guid as the primary key.
-		return $this->row($item);
-	}
-
-	/**
-	 * Update single row with multiple values to a given table
-	 *          Example: $this->item(Array);
-	 *
-	 * @param   array    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function row(array $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->row($item, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->row($item, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update multiple rows to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of arrays)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function rows(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->rows($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->rows($items, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update single item with multiple values to a given table
-	 *          Example: $this->item(Object);
-	 *
-	 * @param   object    $item   The item to save
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function item(object $item): bool
-	{
-		// check if object could be modelled
-		if (($item = $this->model->item($item, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->item($item, 'guid', $this->table);
-		}
-		return false;
-	}
-
-	/**
-	 * Update multiple items to a given table
-	 *          Example: $this->items(Array);
-	 *
-	 * @param   array|null   $items  The items updated in database (array of objects)
-	 *
-	 * @return  bool
-	 * @since 3.2.0
-	 */
-	public function items(?array $items): bool
-	{
-		// check if object could be modelled
-		if (($items = $this->model->items($items, $this->table)) !== null)
-		{
-			// Update the column of this table using guid as the primary key.
-			return $this->database->items($items, 'guid', $this->table);
-		}
-		return false;
-	}
\ No newline at end of file
+	protected string $table = 'power';
\ No newline at end of file
diff --git a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/settings.json b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/settings.json
index 811a4fa..c70e065 100644
--- a/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/settings.json
+++ b/src/e543c123-b1d9-4a0b-83b2-a9d371da5ff3/settings.json
@@ -1,28 +1,20 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "8f83fb79-f92b-4f1f-952b-325f6c22d11e",
     "guid": "e543c123-b1d9-4a0b-83b2-a9d371da5ff3",
     "implements": [
-        "69c29be3-ab25-4f56-944e-7ada6307b10c"
+        "68a41264-64c0-441a-a3d8-8a5e557b1883"
     ],
     "load_selection": null,
     "name": "Update",
     "power_version": "1.0.0",
-    "system_name": "JCB.Power.Database.Update",
-    "type": "class",
-    "use_selection": {
-        "use_selection0": {
-            "use": "8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff",
-            "as": "Model"
-        },
-        "use_selection1": {
-            "use": "cce56585-58b0-4f72-a92c-e2635ea52d83",
-            "as": "Database"
-        }
-    },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Power.Database.Update",
-    "description": "Power Database Update\r\n\r\n@since 3.2.0",
+    "system_name": "JCB.Power.Data.Update",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Power.Data.Update",
+    "description": "Power Data Update (GUID)\r\n\r\n@since 3.2.2",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
     "composer": ""
diff --git a/src/e54965e7-34fd-481e-b40c-4da089afec5a/code.php b/src/e54965e7-34fd-481e-b40c-4da089afec5a/code.php
index 134d2ac..ce321c6 100644
--- a/src/e54965e7-34fd-481e-b40c-4da089afec5a/code.php
+++ b/src/e54965e7-34fd-481e-b40c-4da089afec5a/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e54965e7-34fd-481e-b40c-4da089afec5a/settings.json b/src/e54965e7-34fd-481e-b40c-4da089afec5a/settings.json
index 8568601..eb70663 100644
--- a/src/e54965e7-34fd-481e-b40c-4da089afec5a/settings.json
+++ b/src/e54965e7-34fd-481e-b40c-4da089afec5a/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.HasPermissions",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.HasPermissions",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.HasPermissions",
     "description": "Has Permissions Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/code.php b/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/code.php
index 052e663..eb6c3c3 100644
--- a/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/code.php
+++ b/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
-use VastDevelopmentMethod\Joomla\Componentbuilder\Abstraction\BaseRegistry;
+use VDM\Joomla\Componentbuilder\Abstraction\BaseRegistry;
 
 
 /**
diff --git a/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/settings.json b/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/settings.json
index 4f7a179..2f02537 100644
--- a/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/settings.json
+++ b/src/e5d9804f-0eb0-4ee9-b406-ad4e8cdbc1f6/settings.json
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Registry",
     "type": "class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Registry",
     "description": "Compiler Registry\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/e6683873-b74e-4b54-8466-69f8a9282033/README.md b/src/e6683873-b74e-4b54-8466-69f8a9282033/README.md
index 9cb3ae4..b07d39f 100644
--- a/src/e6683873-b74e-4b54-8466-69f8a9282033/README.md
+++ b/src/e6683873-b74e-4b54-8466-69f8a9282033/README.md
@@ -8,6 +8,7 @@
 ```
 # final class CoreField (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class CoreField << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/e6683873-b74e-4b54-8466-69f8a9282033/code.php b/src/e6683873-b74e-4b54-8466-69f8a9282033/code.php
index 8ce181f..4b3a42f 100644
--- a/src/e6683873-b74e-4b54-8466-69f8a9282033/code.php
+++ b/src/e6683873-b74e-4b54-8466-69f8a9282033/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Field\JoomlaThree;
 
 
 use Joomla\CMS\Filesystem\Folder;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Field\CoreFieldInterface;
 
 
diff --git a/src/e6683873-b74e-4b54-8466-69f8a9282033/settings.json b/src/e6683873-b74e-4b54-8466-69f8a9282033/settings.json
index ac3944b..e640fe8 100644
--- a/src/e6683873-b74e-4b54-8466-69f8a9282033/settings.json
+++ b/src/e6683873-b74e-4b54-8466-69f8a9282033/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e6683873-b74e-4b54-8466-69f8a9282033",
     "implements": [
         "e2f5fddf-cbc8-44ee-836c-7f3fb08d8900"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.CoreField",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.JoomlaThree.CoreField",
     "description": "Core Joomla Fields\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Filesystem\\Folder;",
diff --git a/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/code.php b/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/code.php
index 1eac2ac..8675c29 100644
--- a/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/code.php
+++ b/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/settings.json b/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/settings.json
index 3685357..7940116 100644
--- a/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/settings.json
+++ b/src/e696927b-e8f4-4cfc-9d25-215db4e3c7a8/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.LibraryManager",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.LibraryManager",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.LibraryManager",
     "description": "Library Manager Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/README.md b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/README.md
index 9e884b3..405ec2f 100644
--- a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/README.md
+++ b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/README.md
@@ -8,6 +8,7 @@
 ```
 # class Fields (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Fields  #Gold {
diff --git a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/code.php b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/code.php
index 0aef1c2..42c4e2c 100644
--- a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/code.php
+++ b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/code.php
@@ -24,9 +24,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Field;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Name as FieldName;
 use VDM\Joomla\Componentbuilder\Compiler\Field\Groups as FieldGroups;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Updatesql;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
 
 
 /**
diff --git a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/settings.json b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/settings.json
index 86d20ef..55624b2 100644
--- a/src/e6a64c41-405e-4bbc-9722-27402c22bbea/settings.json
+++ b/src/e6a64c41-405e-4bbc-9722-27402c22bbea/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e6a64c41-405e-4bbc-9722-27402c22bbea",
     "implements": null,
     "load_selection": null,
@@ -59,7 +59,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Fields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Fields",
     "description": "Model Fields Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Language\\Text;\r\nuse Joomla\\CMS\\Application\\CMSApplication;",
diff --git a/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/README.md b/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/README.md
index 7e975d4..a1f95f5 100644
--- a/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/README.md
+++ b/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/README.md
@@ -8,6 +8,7 @@
 ```
 # class Counter (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Counter  #Gold {
diff --git a/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/settings.json b/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/settings.json
index 456274c..dd90db0 100644
--- a/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/settings.json
+++ b/src/e6d871a6-bbe7-497d-af01-68f6bb9a87f4/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e6d871a6-bbe7-497d-af01-68f6bb9a87f4",
     "implements": null,
     "load_selection": null,
@@ -15,6 +15,7 @@
             "as": "Content"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Counter",
     "description": "Compiler Utilities Counter\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/README.md b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/README.md
index 4095898..cd9fc44 100644
--- a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/README.md
+++ b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/README.md
@@ -8,6 +8,7 @@
 ```
 # class Cssadminview (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Cssadminview  #Gold {
diff --git a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/code.php b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/code.php
index 2de7655..e9855a1 100644
--- a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/code.php
+++ b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/code.php
@@ -14,7 +14,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Dispenser;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/settings.json b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/settings.json
index b65cf60..5788025 100644
--- a/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/settings.json
+++ b/src/e79842d3-51b7-4282-93c7-3487cd8b61ab/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e79842d3-51b7-4282-93c7-3487cd8b61ab",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Cssadminview",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Cssadminview",
     "description": "Model CSS Admin View Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e7fff971-b031-42bf-8009-ef554e30854d/README.md b/src/e7fff971-b031-42bf-8009-ef554e30854d/README.md
index db54510..27d02ee 100644
--- a/src/e7fff971-b031-42bf-8009-ef554e30854d/README.md
+++ b/src/e7fff971-b031-42bf-8009-ef554e30854d/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Settings (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component\JoomlaFour**
+> extends: ****
 ```uml
 @startuml
 class Settings << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/e7fff971-b031-42bf-8009-ef554e30854d/code.php b/src/e7fff971-b031-42bf-8009-ef554e30854d/code.php
index 061629a..15b9004 100644
--- a/src/e7fff971-b031-42bf-8009-ef554e30854d/code.php
+++ b/src/e7fff971-b031-42bf-8009-ef554e30854d/code.php
@@ -21,9 +21,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Component;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Paths;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Dynamicpath;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Pathfix;
-use VastDevelopmentMethod\Joomla\Utilities\FileHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\FileHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Component\SettingsInterface;
 
 
diff --git a/src/e7fff971-b031-42bf-8009-ef554e30854d/settings.json b/src/e7fff971-b031-42bf-8009-ef554e30854d/settings.json
index bb0a51c..7380d63 100644
--- a/src/e7fff971-b031-42bf-8009-ef554e30854d/settings.json
+++ b/src/e7fff971-b031-42bf-8009-ef554e30854d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e7fff971-b031-42bf-8009-ef554e30854d",
     "implements": [
         "5f44e66a-31d0-45ff-92b3-b7372dc57ae9"
@@ -61,7 +61,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.JoomlaFour.Settings",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.JoomlaFour.Settings",
     "description": "Compiler Component (Joomla Version) Settings\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e85175fd-e297-46df-a497-27f7a37190fd/README.md b/src/e85175fd-e297-46df-a497-27f7a37190fd/README.md
index 08250e7..2742a0c 100644
--- a/src/e85175fd-e297-46df-a497-27f7a37190fd/README.md
+++ b/src/e85175fd-e297-46df-a497-27f7a37190fd/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowEdit (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaFive\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowEdit << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/e85175fd-e297-46df-a497-27f7a37190fd/settings.json b/src/e85175fd-e297-46df-a497-27f7a37190fd/settings.json
index d882767..e18063a 100644
--- a/src/e85175fd-e297-46df-a497-27f7a37190fd/settings.json
+++ b/src/e85175fd-e297-46df-a497-27f7a37190fd/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e85175fd-e297-46df-a497-27f7a37190fd",
     "implements": [
         "992a842f-1ba9-4a5c-b214-042459ffe038"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Controller.AllowEdit",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaFive.Controller.AllowEdit",
     "description": "Controller Allow Edit Class for Joomla 5\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e923311a-4058-4e81-9f67-5956fd0c627c/README.md b/src/e923311a-4058-4e81-9f67-5956fd0c627c/README.md
index d5a9bfc..ae1e794 100644
--- a/src/e923311a-4058-4e81-9f67-5956fd0c627c/README.md
+++ b/src/e923311a-4058-4e81-9f67-5956fd0c627c/README.md
@@ -8,6 +8,7 @@
 ```
 # interface InjectorInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power**
+> extends: ****
 ```uml
 @startuml
 interface InjectorInterface  #Lavender {
diff --git a/src/e923311a-4058-4e81-9f67-5956fd0c627c/settings.json b/src/e923311a-4058-4e81-9f67-5956fd0c627c/settings.json
index df69c20..850d3e1 100644
--- a/src/e923311a-4058-4e81-9f67-5956fd0c627c/settings.json
+++ b/src/e923311a-4058-4e81-9f67-5956fd0c627c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "e923311a-4058-4e81-9f67-5956fd0c627c",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Interfaces.Power.InjectorInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Power.InjectorInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Power.InjectorInterface",
     "description": "Compiler Power Injector\r\n@since 3.2.1",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/code.php b/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/code.php
index 47d4044..1b6fd59 100644
--- a/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/code.php
+++ b/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/settings.json b/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/settings.json
index f0e8dc1..e6276d6 100644
--- a/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/settings.json
+++ b/src/e9b6b06b-f600-4f9d-984d-79c70ae7ae92/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ExtensionCustomFields",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ExtensionCustomFields",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ExtensionCustomFields",
     "description": "Extension Custom Fields Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/README.md b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/README.md
index 8e20973..9b0c6ca 100644
--- a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/README.md
+++ b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/README.md
@@ -8,6 +8,7 @@
 ```
 # class Compiler (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Compiler  #Gold {
diff --git a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/code.php b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/code.php
index 449ae3f..479a2cc 100644
--- a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/code.php
+++ b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/code.php
@@ -16,7 +16,7 @@ use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
 use VDM\Joomla\Componentbuilder\Compiler\Registry;
-use VastDevelopmentMethod\Joomla\Componentbuilder\Table;
+use VDM\Joomla\Componentbuilder\Table;
 
 
 /**
diff --git a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/settings.json b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/settings.json
index 0738cd8..7d4d910 100644
--- a/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/settings.json
+++ b/src/ea5ed06e-72ae-4906-9167-1cc0fa32fe69/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ea5ed06e-72ae-4906-9167-1cc0fa32fe69",
     "implements": [
         "-1"
@@ -25,6 +25,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Compiler",
     "description": "Compiler Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/eb33420d-359d-44a5-852e-613aef1feaae/README.md b/src/eb33420d-359d-44a5-852e-613aef1feaae/README.md
index 8976ff6..10e2a9d 100644
--- a/src/eb33420d-359d-44a5-852e-613aef1feaae/README.md
+++ b/src/eb33420d-359d-44a5-852e-613aef1feaae/README.md
@@ -8,6 +8,7 @@
 ```
 # class TypeName (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Field**
+> extends: ****
 ```uml
 @startuml
 class TypeName  #Gold {
diff --git a/src/eb33420d-359d-44a5-852e-613aef1feaae/code.php b/src/eb33420d-359d-44a5-852e-613aef1feaae/code.php
index 5bec297..4f6555a 100644
--- a/src/eb33420d-359d-44a5-852e-613aef1feaae/code.php
+++ b/src/eb33420d-359d-44a5-852e-613aef1feaae/code.php
@@ -12,11 +12,11 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Field;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ObjectHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\String\TypeHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\ObjectHelper;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\String\TypeHelper;
 
 
 /**
diff --git a/src/eb33420d-359d-44a5-852e-613aef1feaae/settings.json b/src/eb33420d-359d-44a5-852e-613aef1feaae/settings.json
index dc682bd..232ce92 100644
--- a/src/eb33420d-359d-44a5-852e-613aef1feaae/settings.json
+++ b/src/eb33420d-359d-44a5-852e-613aef1feaae/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "eb33420d-359d-44a5-852e-613aef1feaae",
     "implements": null,
     "load_selection": null,
@@ -31,7 +31,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Field.TypeName",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Field.TypeName",
     "description": "Compiler Field Type Name\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/README.md b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/README.md
index ed43aa4..cf6c6fd 100644
--- a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/README.md
+++ b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/README.md
@@ -8,6 +8,7 @@
 ```
 # class Custombuttons (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Custombuttons  #Gold {
diff --git a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/code.php b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/code.php
index 3235dbb..48bd939 100644
--- a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/code.php
+++ b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/code.php
@@ -16,9 +16,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Templatelayout\Data as Templatelayout;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/settings.json b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/settings.json
index 951d9ab..fd70f03 100644
--- a/src/ebe3287d-bfa0-4519-b663-f442f4dea432/settings.json
+++ b/src/ebe3287d-bfa0-4519-b663-f442f4dea432/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ebe3287d-bfa0-4519-b663-f442f4dea432",
     "implements": null,
     "load_selection": null,
@@ -39,7 +39,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Custombuttons",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Custombuttons",
     "description": "Model Custom Buttons Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ec0682ee-9166-48f8-951b-9b763792c1d1/code.php b/src/ec0682ee-9166-48f8-951b-9b763792c1d1/code.php
index 053a982..c954062 100644
--- a/src/ec0682ee-9166-48f8-951b-9b763792c1d1/code.php
+++ b/src/ec0682ee-9166-48f8-951b-9b763792c1d1/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/ec0682ee-9166-48f8-951b-9b763792c1d1/settings.json b/src/ec0682ee-9166-48f8-951b-9b763792c1d1/settings.json
index 33ea272..9547106 100644
--- a/src/ec0682ee-9166-48f8-951b-9b763792c1d1/settings.json
+++ b/src/ec0682ee-9166-48f8-951b-9b763792c1d1/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.SiteDynamicGet",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.SiteDynamicGet",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.SiteDynamicGet",
     "description": "Site Dynamic Get Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/README.md b/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/README.md
index 5b23c5f..9707619 100644
--- a/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/README.md
+++ b/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/README.md
@@ -8,6 +8,7 @@
 ```
 # final class RouterConstructorManual (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class RouterConstructorManual << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/settings.json b/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/settings.json
index c6cb4ed..640574f 100644
--- a/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/settings.json
+++ b/src/ec7bdbf9-8377-446e-9f40-64e23ae96b59/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ec7bdbf9-8377-446e-9f40-64e23ae96b59",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.RouterConstructorManual",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.RouterConstructorManual",
     "description": "Router Constructor Default Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/code.php b/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/code.php
index cb97bbb..19f10f9 100644
--- a/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/code.php
+++ b/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsArray;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsArray;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/settings.json b/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/settings.json
index a777f30..ba4d786 100644
--- a/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/settings.json
+++ b/src/ed314bd8-c995-4282-bcaa-5e0a68ac401b/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ConfigFieldsetsCustomfield",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ConfigFieldsetsCustomfield",
     "description": "Config Field Sets Custom Field Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/README.md b/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/README.md
index 82bfba9..2947bb9 100644
--- a/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/README.md
+++ b/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/README.md
@@ -8,6 +8,7 @@
 ```
 # class Extension (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Extension  #Gold {
diff --git a/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/settings.json b/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/settings.json
index 0e89123..e34003a 100644
--- a/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/settings.json
+++ b/src/ed9591cb-0a03-400a-bf47-eaf78ab19b9d/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ed9591cb-0a03-400a-bf47-eaf78ab19b9d",
     "implements": [
         "-1"
@@ -29,6 +29,7 @@
             "as": "J5InstallScript"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Extension",
     "description": "Extension Script Service Provider\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/README.md b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/README.md
index 0acc1c7..bb5fbe1 100644
--- a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/README.md
+++ b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/README.md
@@ -8,6 +8,7 @@
 ```
 # class Extractor (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Extractor  #Gold {
diff --git a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/code.php b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/code.php
index d8f2d82..e9c6ed8 100644
--- a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/code.php
+++ b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/code.php
@@ -13,7 +13,7 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Power;
 
 
 use Joomla\CMS\Factory;
-use VastDevelopmentMethod\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Utilities\GuidHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Power\ExtractorInterface;
 
 
diff --git a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/settings.json b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/settings.json
index 279b580..efa2daf 100644
--- a/src/eeb03266-22fd-45bb-953a-961bb6be3a54/settings.json
+++ b/src/eeb03266-22fd-45bb-953a-961bb6be3a54/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "eeb03266-22fd-45bb-953a-961bb6be3a54",
     "implements": [
         "c159425c-51f9-4a15-af99-f2d0c6d7aae8"
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Extractor",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Power.Extractor",
     "description": "Compiler Power Extractor\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/README.md b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/README.md
new file mode 100644
index 0000000..07c12c6
--- /dev/null
+++ b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/README.md
@@ -0,0 +1,31 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# final class Delete (Details)
+> namespace: **VDM\Joomla\Componentbuilder\JoomlaPower\Data**
+> extends: **ExtendingDelete**
+```uml
+@startuml
+class Delete << (F,LightGreen) >> #RoyalBlue {
+  # string $table
+}
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.php b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.php
new file mode 100644
index 0000000..76a7d99
--- /dev/null
+++ b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September, 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace VDM\Joomla\Componentbuilder\JoomlaPower\Data;
+
+
+use VDM\Joomla\Interfaces\Data\DeleteInterface;
+use VDM\Joomla\Abstraction\Data\Delete as ExtendingDelete;
+
+
+/**
+ * Joomla Power Data Delete
+ * 
+ * @since 3.2.2
+ */
+final class Delete extends ExtendingDelete implements DeleteInterface
+{
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.2
+	 */
+	protected string $table = 'joomla_power';
+}
+
diff --git a/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.power b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.power
new file mode 100644
index 0000000..36f750a
--- /dev/null
+++ b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/code.power
@@ -0,0 +1,7 @@
+	/**
+	 * Table Name
+	 *
+	 * @var    string
+	 * @since 3.2.2
+	 */
+	protected string $table = 'joomla_power';
\ No newline at end of file
diff --git a/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/settings.json b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/settings.json
new file mode 100644
index 0000000..a977b36
--- /dev/null
+++ b/src/ef452ee0-9714-4b15-a86d-8ebc4af7734d/settings.json
@@ -0,0 +1,21 @@
+{
+    "add_head": "0",
+    "add_licensing_template": "2",
+    "extends": "3fc72954-a303-4cac-b53c-554be38b85e7",
+    "guid": "ef452ee0-9714-4b15-a86d-8ebc4af7734d",
+    "implements": [
+        "d8f9ba53-c490-4e8b-8e9f-6757224e069c"
+    ],
+    "load_selection": null,
+    "name": "Delete",
+    "power_version": "1.0.0",
+    "system_name": "JCB.JoomlaPower.Data.Delete",
+    "type": "final class",
+    "use_selection": null,
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.JoomlaPower.Data.Delete",
+    "description": "Joomla Power Data Delete\r\n\r\n@since 3.2.2",
+    "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
+    "head": "",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/README.md b/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/README.md
index 12a60fe..61dae3a 100644
--- a/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/README.md
+++ b/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/README.md
@@ -8,6 +8,7 @@
 ```
 # interface DispenserInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Customcode**
+> extends: ****
 ```uml
 @startuml
 interface DispenserInterface  #Lavender {
diff --git a/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/settings.json b/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/settings.json
index ad68514..141b32a 100644
--- a/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/settings.json
+++ b/src/ef687e42-dc25-4423-9dd4-ec6e9743cfb0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ef687e42-dc25-4423-9dd4-ec6e9743cfb0",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Interfaces.Customcode.DispenserInterface",
     "type": "interface",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Customcode.DispenserInterface",
     "description": "Customcode Dispenser Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/README.md b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/README.md
index 165cfbc..c8ecb48 100644
--- a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/README.md
+++ b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Component**
+> extends: ****
 ```uml
 @startuml
 class Data << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php
index 8b36f74..93ba301 100644
--- a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php
+++ b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/code.php
@@ -35,10 +35,10 @@ use VDM\Joomla\Componentbuilder\Compiler\Model\Updateserver;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Joomlamodules;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Joomlaplugins;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Router;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;
 
 
 /**
diff --git a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/settings.json b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/settings.json
index f69d462..28d48c6 100644
--- a/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/settings.json
+++ b/src/ef9578e5-4c9d-46bf-866f-3a94bdc7b753/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ef9578e5-4c9d-46bf-866f-3a94bdc7b753",
     "implements": null,
     "load_selection": null,
@@ -115,7 +115,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Component.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Component.Data",
     "description": "Compiler Component Data\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/README.md b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/README.md
index 230ab6e..97bd9f8 100644
--- a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/README.md
+++ b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/README.md
@@ -8,6 +8,7 @@
 ```
 # class Joomlaplugins (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Joomlaplugins  #Gold {
diff --git a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/code.php b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/code.php
index 9dc2171..5362e49 100644
--- a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/code.php
+++ b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/code.php
@@ -14,8 +14,8 @@ namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Joomlaplugin\Data as Plugin;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
 
 
 /**
diff --git a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/settings.json b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/settings.json
index 03f919b..18f1aa3 100644
--- a/src/ef97b03e-1018-447a-8d7e-30401b0257bb/settings.json
+++ b/src/ef97b03e-1018-447a-8d7e-30401b0257bb/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ef97b03e-1018-447a-8d7e-30401b0257bb",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Joomlaplugins",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Joomlaplugins",
     "description": "Model  Joomla Plugins Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/README.md b/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/README.md
index a61f66f..582288c 100644
--- a/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/README.md
+++ b/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/README.md
@@ -8,6 +8,7 @@
 ```
 # class Readme (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power\Repo**
+> extends: ****
 ```uml
 @startuml
 class Readme  #Gold {
diff --git a/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/settings.json b/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/settings.json
index 634ca63..ef223d1 100644
--- a/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/settings.json
+++ b/src/efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "efb1d0f8-2d14-4d2c-8b5f-4fcdd9df45a5",
     "implements": null,
     "load_selection": null,
@@ -23,6 +23,7 @@
             "as": "default"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Repo.Readme",
     "description": "Compiler Power Repo Readme\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/README.md b/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/README.md
index ae40282..337528f 100644
--- a/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/README.md
+++ b/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/README.md
@@ -8,6 +8,7 @@
 ```
 # abstract class Unique (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 abstract Unique  #Orange {
diff --git a/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/settings.json b/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/settings.json
index 71c2f1d..f65aa03 100644
--- a/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/settings.json
+++ b/src/f02fb1df-f4b6-4be1-9595-2e72084a5e6e/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f02fb1df-f4b6-4be1-9595-2e72084a5e6e",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Utilities.Unique",
     "type": "abstract class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Unique",
     "description": "Compiler Creating an Unique Code\/String\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/code.php b/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/code.php
index d24004d..ea297d4 100644
--- a/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/code.php
+++ b/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/code.php
@@ -12,9 +12,9 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Abstraction\Registry\Traits\IsString;
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Abstraction\Registry\Traits\IsString;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/settings.json b/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/settings.json
index 34c6a89..3b97ba6 100644
--- a/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/settings.json
+++ b/src/f052eeef-5112-4efe-98c8-8c7db69dc2d1/settings.json
@@ -17,7 +17,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.MetaData",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.MetaData",
     "description": "Meta Data Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/README.md b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/README.md
index baf85af..6c1a290 100644
--- a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/README.md
+++ b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/README.md
@@ -8,6 +8,7 @@
 ```
 # class Data (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Alias**
+> extends: ****
 ```uml
 @startuml
 class Data  #Gold {
diff --git a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/code.php b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/code.php
index c91db21..c01caa1 100644
--- a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/code.php
+++ b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/code.php
@@ -20,8 +20,8 @@ use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode\Gui;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Loader;
 use VDM\Joomla\Componentbuilder\Compiler\Model\Libraries;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 
 
 /**
diff --git a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/settings.json b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/settings.json
index b4c43ac..107c359 100644
--- a/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/settings.json
+++ b/src/f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f05ac28d-44f4-4e6d-a1be-5c8ae6baf69c",
     "implements": null,
     "load_selection": null,
@@ -47,7 +47,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Alias.Data",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Alias.Data",
     "description": "Alias Data Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;",
diff --git a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/README.md b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/README.md
index cb36b0b..436bb4b 100644
--- a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/README.md
+++ b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/README.md
@@ -8,6 +8,7 @@
 ```
 # class Dispenser (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Customcode**
+> extends: ****
 ```uml
 @startuml
 class Dispenser  #Gold {
diff --git a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/code.php b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/code.php
index 39dc15e..ed919e2 100644
--- a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/code.php
+++ b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/code.php
@@ -12,7 +12,7 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Customcode;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
diff --git a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/settings.json b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/settings.json
index 37b72e4..b94ef62 100644
--- a/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/settings.json
+++ b/src/f1dc6430-fb54-452e-aa53-ce32ae93db88/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f1dc6430-fb54-452e-aa53-ce32ae93db88",
     "implements": [
         "ef687e42-dc25-4423-9dd4-ec6e9743cfb0"
@@ -41,7 +41,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Customcode.Dispenser",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Customcode.Dispenser",
     "description": "Compiler Custom Code Dispenser\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f21388dc-5ddc-4970-a3c2-55f075024762/README.md b/src/f21388dc-5ddc-4970-a3c2-55f075024762/README.md
index de110bb..701d2c9 100644
--- a/src/f21388dc-5ddc-4970-a3c2-55f075024762/README.md
+++ b/src/f21388dc-5ddc-4970-a3c2-55f075024762/README.md
@@ -8,6 +8,7 @@
 ```
 # final class AllowAdd (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Architecture\JoomlaThree\Controller**
+> extends: ****
 ```uml
 @startuml
 class AllowAdd << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/f21388dc-5ddc-4970-a3c2-55f075024762/settings.json b/src/f21388dc-5ddc-4970-a3c2-55f075024762/settings.json
index 9ff3d5d..4f8e277 100644
--- a/src/f21388dc-5ddc-4970-a3c2-55f075024762/settings.json
+++ b/src/f21388dc-5ddc-4970-a3c2-55f075024762/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f21388dc-5ddc-4970-a3c2-55f075024762",
     "implements": [
         "c9700450-4f44-4455-bc86-6a7660daadee"
@@ -33,7 +33,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Controller.AllowAdd",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Architecture.JoomlaThree.Controller.AllowAdd",
     "description": "Controller Allow Add Class for Joomla 3\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f34442df-c84c-44c3-9991-bbf72bffa635/code.php b/src/f34442df-c84c-44c3-9991-bbf72bffa635/code.php
index 3eaaecd..4013459 100644
--- a/src/f34442df-c84c-44c3-9991-bbf72bffa635/code.php
+++ b/src/f34442df-c84c-44c3-9991-bbf72bffa635/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/f34442df-c84c-44c3-9991-bbf72bffa635/settings.json b/src/f34442df-c84c-44c3-9991-bbf72bffa635/settings.json
index d9d4e18..d59868e 100644
--- a/src/f34442df-c84c-44c3-9991-bbf72bffa635/settings.json
+++ b/src/f34442df-c84c-44c3-9991-bbf72bffa635/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.ViewsDefaultOrdering",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.ViewsDefaultOrdering",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.ViewsDefaultOrdering",
     "description": "Views Default Ordering Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/README.md b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/README.md
index 20d7d2b..66bf62c 100644
--- a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/README.md
+++ b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/README.md
@@ -8,6 +8,7 @@
 ```
 # class Filesfolders (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model**
+> extends: ****
 ```uml
 @startuml
 class Filesfolders  #Gold {
diff --git a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/code.php b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/code.php
index 9ee9828..f3b30e2 100644
--- a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/code.php
+++ b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Model;
 
 
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
 
 
 /**
diff --git a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/settings.json b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/settings.json
index b154027..dc817bc 100644
--- a/src/f4578c04-a81e-4218-b80d-b0612196eaf0/settings.json
+++ b/src/f4578c04-a81e-4218-b80d-b0612196eaf0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f4578c04-a81e-4218-b80d-b0612196eaf0",
     "implements": null,
     "load_selection": null,
@@ -19,7 +19,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.Filesfolders",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.Filesfolders",
     "description": "Model Files & Folders Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f48764e0-16c6-459c-8576-af7616f3b720/README.md b/src/f48764e0-16c6-459c-8576-af7616f3b720/README.md
index 7e31781..36c7bff 100644
--- a/src/f48764e0-16c6-459c-8576-af7616f3b720/README.md
+++ b/src/f48764e0-16c6-459c-8576-af7616f3b720/README.md
@@ -8,6 +8,7 @@
 ```
 # final class FieldAsString (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Creator**
+> extends: ****
 ```uml
 @startuml
 class FieldAsString << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/f48764e0-16c6-459c-8576-af7616f3b720/settings.json b/src/f48764e0-16c6-459c-8576-af7616f3b720/settings.json
index e6ae4e2..b14344a 100644
--- a/src/f48764e0-16c6-459c-8576-af7616f3b720/settings.json
+++ b/src/f48764e0-16c6-459c-8576-af7616f3b720/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f48764e0-16c6-459c-8576-af7616f3b720",
     "implements": null,
     "load_selection": null,
@@ -27,7 +27,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Creator.FieldAsString",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Creator.FieldAsString",
     "description": "Get any field as a string Creator Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/README.md b/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/README.md
index 78c319a..1bddca4 100644
--- a/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/README.md
+++ b/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/README.md
@@ -8,6 +8,7 @@
 ```
 # class CoreRules (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Service**
+> extends: ****
 ```uml
 @startuml
 class CoreRules  #Gold {
diff --git a/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/settings.json b/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/settings.json
index 2154cb7..2b5313e 100644
--- a/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/settings.json
+++ b/src/f65b52c2-593a-4c35-89d1-4a8e57a1adf0/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f65b52c2-593a-4c35-89d1-4a8e57a1adf0",
     "implements": [
         "-1"
@@ -29,7 +29,8 @@
             "as": "CoreRule"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Service.CoreRules",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Service.CoreRules",
     "description": "Joomla Core Rules\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/README.md b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/README.md
index 0d22228..ffef119 100644
--- a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/README.md
+++ b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Xml (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Utilities**
+> extends: ****
 ```uml
 @startuml
 class Xml << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/code.php b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/code.php
index 7a4395c..feb07b3 100644
--- a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/code.php
+++ b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/code.php
@@ -17,7 +17,7 @@ use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use VDM\Joomla\Componentbuilder\Compiler\Factory as Compiler;
 use VDM\Joomla\Componentbuilder\Compiler\Config;
-use VastDevelopmentMethod\Joomla\Utilities\FormHelper;
+use VDM\Joomla\Utilities\FormHelper;
 
 
 /**
diff --git a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/settings.json b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/settings.json
index 3e578ff..e0338ec 100644
--- a/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/settings.json
+++ b/src/f6ba34a2-0cd7-4dc1-ab67-75e962a5045b/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "f6ba34a2-0cd7-4dc1-ab67-75e962a5045b",
     "implements": null,
     "load_selection": null,
@@ -23,7 +23,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Utilities.Xml",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Utilities.Xml",
     "description": "Compiler Utilities Xml\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "use Joomla\\CMS\\Factory;\r\nuse Joomla\\CMS\\Application\\CMSApplication;\r\nuse Joomla\\CMS\\Language\\Text;",
diff --git a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/README.md b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/README.md
index aea2d0a..9af3c10 100644
--- a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/README.md
+++ b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/README.md
@@ -14,10 +14,8 @@
 class Config  #Gold {
   # JoomlaRegistry $config
   + __construct(?Input $input = null, ?JoomlaRegistry $params = null, ...)
+  # getGiteausername() : ?string
   # getGiteatoken() : ?string
-  # getAddcustomgiteaurl() : int
-  # getCustomgiteaurl() : ?string
-  # getCustomgiteatoken() : ?string
   # getSuperpowerscoreorganisation() : string
   # getSuperpowerscorerepos() : array
   # getAddcontributors() : bool
@@ -103,34 +101,20 @@ note right of Config::__construct
     ?JoomlaRegistry $config = null
 end note
 
-note left of Config::getGiteatoken
+note left of Config::getGiteausername
+  get Gitea Username
+
+  since: 3.2.0
+  return: ?string
+end note
+
+note right of Config::getGiteatoken
   get Gitea Access Token
 
   since: 3.2.0
   return: ?string
 end note
 
-note right of Config::getAddcustomgiteaurl
-  get Add Custom Gitea URL
-
-  since: 3.2.0
-  return: int
-end note
-
-note left of Config::getCustomgiteaurl
-  get Custom Gitea URL
-
-  since: 3.2.0
-  return: ?string
-end note
-
-note right of Config::getCustomgiteatoken
-  get Custom Gitea Access Token
-
-  since: 3.2.0
-  return: ?string
-end note
-
 note left of Config::getSuperpowerscoreorganisation
   Get super power core organisation
 
diff --git a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.php b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.php
index 0ae2ddc..09f6b89 100644
--- a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.php
+++ b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.php
@@ -13,9 +13,11 @@ namespace VDM\Joomla\Componentbuilder\Compiler;
 
 
 use Joomla\Registry\Registry as JoomlaRegistry;
-use Joomla\CMS\Factory as JoomlaFactory;
-use VastDevelopmentMethod\Joomla\Utilities\GetHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Factory as JoomlaFactory;
+use Joomla\Input\Input;
+use VDM\Joomla\Utilities\GetHelper;
+use VDM\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Componentbuilder\Utilities\RepoHelper;
 use VDM\Joomla\Componentbuilder\Abstraction\BaseConfig;
 
 
@@ -43,9 +45,9 @@ class Config extends BaseConfig
 	/**
 	 * Constructor
 	 *
-	 * @param Input|null        $input      Input
-	 * @param Registry|null     $params     The component parameters
-	 * @param Registry|null     $config     The Joomla configuration
+	 * @param Input|null            $input      Input
+	 * @param JoomlaRegistry|null   $params     The component parameters
+	 * @param JoomlaRegistry|null   $config     The Joomla configuration
 	 *
 	 * @throws \Exception
 	 * @since 3.2.0
@@ -57,6 +59,17 @@ class Config extends BaseConfig
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -65,50 +78,7 @@ class Config extends BaseConfig
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -122,11 +92,6 @@ class Config extends BaseConfig
 		// the VDM default organisation is [joomla]
 		$organisation = 'joomla';
 
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('super_powers_core_organisation', $organisation);
-		}
-
 		return $organisation;
 	}
 
@@ -141,39 +106,66 @@ class Config extends BaseConfig
 		// some defaults repos we need by JCB
 		$repos = [];
 
-		// only add custom init with custom gitea
-		$paths = null;
-		if ($this->add_custom_gitea_url == 2)
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
 		{
-			$paths = $this->params->get('super_powers_core_repos');
+			$repos[$this->gitea_username . '.super-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'super-powers',
+				'read_branch' => 'master'
+			];
 		}
 
-		if (!empty($paths) && is_array($paths))
-		{
-			foreach ($paths as $path)
-			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
-				if ($owner !== null && $repo !== null)
-				{
-					// we make sure to get only the objects
-					$repos = ["{$owner}.{$repo}" => $path] + $repos;
-				}
-			}
-		}
-		else
-		{
-			$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'super-powers', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.jcb-compiler'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'jcb-compiler', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.jcb-packager'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'jcb-packager', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.phpseclib'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'phpseclib', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.search'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'search', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.gitea'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'gitea', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.openai'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'openai', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.minify'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'minify', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.psr'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'psr', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.fof'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'fof', 'branch' => 'master'];
-		}
+		$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'super-powers',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.jcb-compiler'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'jcb-compiler',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.jcb-packager'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'jcb-packager',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.phpseclib'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'phpseclib',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.search'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'search',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.gitea'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'gitea',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.openai'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'openai',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.minify'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'minify',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.psr'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'psr',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.fof'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'fof',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -797,19 +789,14 @@ class Config extends BaseConfig
 		// some defaults repos we need by JCB
 		$approved = $this->super_powers_core_repos;
 
-		if (!$this->add_own_powers)
-		{
-			return array_values($approved);
-		}
+		$paths = RepoHelper::get(1); // super powers = 1
 
-		$paths = $this->params->get('approved_paths');
-
-		if (!empty($paths))
+		if ($paths !== null)
 		{
 			foreach ($paths as $path)
 			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
 				if ($owner !== null && $repo !== null)
 				{
 					// we make sure to get only the objects
@@ -845,7 +832,20 @@ class Config extends BaseConfig
 	{
 		// some defaults repos we need by JCB
 		$repos = [];
-		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['owner' => $this->joomla_powers_core_organisation, 'repo' => 'joomla-powers', 'branch' => 'master'];
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
+		{
+			$repos[$this->gitea_username . '.joomla-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'joomla-powers',
+				'read_branch' => 'master'
+			];
+		}
+		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) [
+			'organisation' => $this->joomla_powers_core_organisation,
+			'repository' => 'joomla-powers',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -866,15 +866,12 @@ class Config extends BaseConfig
 	/**
 	 * Get joomla power approved paths
 	 *
-	 * @return  array The paths to the repositories on Gitea
+	 * @return  array The approved paths to the repositories on Gitea
 	 * @since 3.2.0
 	 */
 	protected function getApprovedjoomlapaths(): array
 	{
-		// some defaults repos we need by JCB
-		$approved = $this->joomla_powers_init_repos;
-
-		return array_values($approved);
+		return array_values($this->joomla_powers_init_repos);
 	}
 
 	/**
diff --git a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.power b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.power
index 0d65089..48f9d02 100644
--- a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.power
+++ b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/code.power
@@ -9,9 +9,9 @@
 	/**
 	 * Constructor
 	 *
-	 * @param Input|null        $input      Input
-	 * @param Registry|null     $params     The component parameters
-	 * @param Registry|null     $config     The Joomla configuration
+	 * @param Input|null            $input      Input
+	 * @param JoomlaRegistry|null   $params     The component parameters
+	 * @param JoomlaRegistry|null   $config     The Joomla configuration
 	 *
 	 * @throws \Exception
 	 * @since 3.2.0
@@ -23,6 +23,17 @@
 		$this->config = $config ?: JoomlaFactory::getConfig();
 	}
 
+	/**
+	 * get Gitea Username
+	 *
+	 * @return  string  the access token
+	 * @since 3.2.0
+	 */
+	protected function getGiteausername(): ?string
+	{
+		return $this->params->get('gitea_username');
+	}
+
 	/**
 	 * get Gitea Access Token
 	 *
@@ -31,50 +42,7 @@
 	 */
 	protected function getGiteatoken(): ?string
 	{
-		return $this->custom_gitea_token ?? $this->params->get('gitea_token');
-	}
-
-	/**
-	 * get Add Custom Gitea URL
-	 *
-	 * @return  int  the add switch
-	 * @since 3.2.0
-	 */
-	protected function getAddcustomgiteaurl(): int
-	{
-		return $this->params->get('add_custom_gitea_url', 1);
-	}
-
-	/**
-	 * get Custom Gitea URL
-	 *
-	 * @return  string  the custom gitea url
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteaurl(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_url');
-		}
-
-		return null;
-	}
-
-	/**
-	 * get Custom Gitea Access Token
-	 *
-	 * @return  string  the custom access token
-	 * @since 3.2.0
-	 */
-	protected function getCustomgiteatoken(): ?string
-	{
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('custom_gitea_token');
-		}
-
-		return null;
+		return $this->params->get('gitea_token');
 	}
 
 	/**
@@ -88,11 +56,6 @@
 		// the VDM default organisation is [joomla]
 		$organisation = 'joomla';
 
-		if ($this->add_custom_gitea_url == 2)
-		{
-			return $this->params->get('super_powers_core_organisation', $organisation);
-		}
-
 		return $organisation;
 	}
 
@@ -107,39 +70,66 @@
 		// some defaults repos we need by JCB
 		$repos = [];
 
-		// only add custom init with custom gitea
-		$paths = null;
-		if ($this->add_custom_gitea_url == 2)
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
 		{
-			$paths = $this->params->get('super_powers_core_repos');
+			$repos[$this->gitea_username . '.super-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'super-powers',
+				'read_branch' => 'master'
+			];
 		}
 
-		if (!empty($paths) && is_array($paths))
-		{
-			foreach ($paths as $path)
-			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
-				if ($owner !== null && $repo !== null)
-				{
-					// we make sure to get only the objects
-					$repos = ["{$owner}.{$repo}" => $path] + $repos;
-				}
-			}
-		}
-		else
-		{
-			$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'super-powers', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.jcb-compiler'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'jcb-compiler', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.jcb-packager'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'jcb-packager', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.phpseclib'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'phpseclib', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.search'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'search', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.gitea'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'gitea', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.openai'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'openai', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.minify'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'minify', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.psr'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'psr', 'branch' => 'master'];
-			$repos[$this->super_powers_core_organisation . '.fof'] = (object) ['owner' => $this->super_powers_core_organisation, 'repo' => 'fof', 'branch' => 'master'];
-		}
+		$repos[$this->super_powers_core_organisation . '.super-powers'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'super-powers',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.jcb-compiler'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'jcb-compiler',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.jcb-packager'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'jcb-packager',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.phpseclib'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'phpseclib',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.search'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'search',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.gitea'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'gitea',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.openai'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'openai',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.minify'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'minify',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.psr'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'psr',
+			'read_branch' => 'master'
+		];
+		$repos[$this->super_powers_core_organisation . '.fof'] = (object) [
+			'organisation' => $this->super_powers_core_organisation,
+			'repository' => 'fof',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -763,19 +753,14 @@
 		// some defaults repos we need by JCB
 		$approved = $this->super_powers_core_repos;
 
-		if (!$this->add_own_powers)
-		{
-			return array_values($approved);
-		}
+		$paths = RepoHelper::get(1); // super powers = 1
 
-		$paths = $this->params->get('approved_paths');
-
-		if (!empty($paths))
+		if ($paths !== null)
 		{
 			foreach ($paths as $path)
 			{
-				$owner = $path->owner ?? null;
-				$repo = $path->repo ?? null;
+				$owner = $path->organisation ?? null;
+				$repo = $path->repository ?? null;
 				if ($owner !== null && $repo !== null)
 				{
 					// we make sure to get only the objects
@@ -811,7 +796,20 @@
 	{
 		// some defaults repos we need by JCB
 		$repos = [];
-		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) ['owner' => $this->joomla_powers_core_organisation, 'repo' => 'joomla-powers', 'branch' => 'master'];
+		// get the users own power repo (can overwrite all)
+		if ($this->gitea_username !== null)
+		{
+			$repos[$this->gitea_username . '.joomla-powers'] = (object) [
+				'organisation' => $this->gitea_username,
+				'repository' => 'joomla-powers',
+				'read_branch' => 'master'
+			];
+		}
+		$repos[$this->joomla_powers_core_organisation . '.joomla-powers'] = (object) [
+			'organisation' => $this->joomla_powers_core_organisation,
+			'repository' => 'joomla-powers',
+			'read_branch' => 'master'
+		];
 
 		return $repos;
 	}
@@ -832,15 +830,12 @@
 	/**
 	 * Get joomla power approved paths
 	 *
-	 * @return  array The paths to the repositories on Gitea
+	 * @return  array The approved paths to the repositories on Gitea
 	 * @since 3.2.0
 	 */
 	protected function getApprovedjoomlapaths(): array
 	{
-		// some defaults repos we need by JCB
-		$approved = $this->joomla_powers_init_repos;
-
-		return array_values($approved);
+		return array_values($this->joomla_powers_init_repos);
 	}
 
 	/**
diff --git a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/settings.json b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/settings.json
index 492b3c0..e585384 100644
--- a/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/settings.json
+++ b/src/fa4bf18e-301e-42e3-91fb-6e0096c07adc/settings.json
@@ -21,11 +21,16 @@
         "use_selection1": {
             "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef",
             "as": "default"
+        },
+        "use_selection2": {
+            "use": "c6619b00-261c-473b-8094-d4fe9e6bab39",
+            "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Config",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Config",
     "description": "Compiler Configurations\r\n\r\n\tAll these functions are accessed via the direct name without the get:\r\n\texample: $this->component_code_name calls: $this->getComponentcodename()\r\n\r\n\tAll values once called are cached, yet can be updated directly:\r\n\texample: $this->component_code_name = 'new_code_name'; \/\/ be warned!\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
-    "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory as JoomlaFactory;",
+    "head": "use Joomla\\Registry\\Registry as JoomlaRegistry;\r\nuse Joomla\\CMS\\Factory as JoomlaFactory;\r\nuse Joomla\\Input\\Input;",
     "composer": ""
 }
\ No newline at end of file
diff --git a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/README.md b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/README.md
index 7a07a69..d2612f3 100644
--- a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/README.md
+++ b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/README.md
@@ -8,6 +8,7 @@
 ```
 # final class Customtabs (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Model\JoomlaThree**
+> extends: ****
 ```uml
 @startuml
 class Customtabs << (F,LightGreen) >> #RoyalBlue {
diff --git a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/code.php b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/code.php
index c497910..d49e422 100644
--- a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/code.php
+++ b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/code.php
@@ -17,9 +17,9 @@ use VDM\Joomla\Componentbuilder\Compiler\Builder\CustomTabs as BuilderCustomTabs
 use VDM\Joomla\Componentbuilder\Compiler\Language;
 use VDM\Joomla\Componentbuilder\Compiler\Placeholder;
 use VDM\Joomla\Componentbuilder\Compiler\Customcode;
-use VastDevelopmentMethod\Joomla\Utilities\JsonHelper;
-use VastDevelopmentMethod\Joomla\Utilities\ArrayHelper;
-use VastDevelopmentMethod\Joomla\Utilities\StringHelper;
+use VDM\Joomla\Utilities\JsonHelper;
+use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\StringHelper;
 use VDM\Joomla\Componentbuilder\Compiler\Utilities\Indent;
 use VDM\Joomla\Componentbuilder\Compiler\Interfaces\Model\CustomtabsInterface;
 
diff --git a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/settings.json b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/settings.json
index d604223..86a2857 100644
--- a/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/settings.json
+++ b/src/fa8c1125-d370-4cb6-a7ff-eb32193c198c/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "fa8c1125-d370-4cb6-a7ff-eb32193c198c",
     "implements": [
         "fcf42c53-0967-4c87-9699-a4d86adfdadf"
@@ -49,7 +49,8 @@
             "as": "default"
         }
     },
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Model.JoomlaThree.Customtabs",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Model.JoomlaThree.Customtabs",
     "description": "Model Custom Tabs Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/README.md b/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/README.md
index abf3c8c..70ae167 100644
--- a/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/README.md
+++ b/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/README.md
@@ -8,6 +8,7 @@
 ```
 # interface CustomtabsInterface (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Interfaces\Model**
+> extends: ****
 ```uml
 @startuml
 interface CustomtabsInterface  #Lavender {
diff --git a/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/settings.json b/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/settings.json
index cae1bd2..e48e3b5 100644
--- a/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/settings.json
+++ b/src/fcf42c53-0967-4c87-9699-a4d86adfdadf/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "fcf42c53-0967-4c87-9699-a4d86adfdadf",
     "implements": null,
     "load_selection": null,
@@ -10,7 +10,8 @@
     "system_name": "JCB.Compiler.Model.CustomtabsInterface",
     "type": "interface",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Interfaces.Model.CustomtabsInterface",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Interfaces.Model.CustomtabsInterface",
     "description": "Model Custom Tabs Interface\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/code.php b/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/code.php
index 8f1b892..85050ed 100644
--- a/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/code.php
+++ b/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/settings.json b/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/settings.json
index 140e4a7..0cf8ac6 100644
--- a/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/settings.json
+++ b/src/fd885c23-88dd-440a-9b05-d02a2b2962f9/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.OtherWhere",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.OtherWhere",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.OtherWhere",
     "description": "Other Where Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/fe87df7f-b65f-4778-8875-6122ab6b025f/code.php b/src/fe87df7f-b65f-4778-8875-6122ab6b025f/code.php
index 5560f3c..5fe1a59 100644
--- a/src/fe87df7f-b65f-4778-8875-6122ab6b025f/code.php
+++ b/src/fe87df7f-b65f-4778-8875-6122ab6b025f/code.php
@@ -12,8 +12,8 @@
 namespace VDM\Joomla\Componentbuilder\Compiler\Builder;
 
 
-use VastDevelopmentMethod\Joomla\Interfaces\Registryinterface;
-use VastDevelopmentMethod\Joomla\Abstraction\Registry;
+use VDM\Joomla\Interfaces\Registryinterface;
+use VDM\Joomla\Abstraction\Registry;
 
 
 /**
diff --git a/src/fe87df7f-b65f-4778-8875-6122ab6b025f/settings.json b/src/fe87df7f-b65f-4778-8875-6122ab6b025f/settings.json
index bf63fc6..864275f 100644
--- a/src/fe87df7f-b65f-4778-8875-6122ab6b025f/settings.json
+++ b/src/fe87df7f-b65f-4778-8875-6122ab6b025f/settings.json
@@ -12,7 +12,8 @@
     "system_name": "JCB.Compiler.Builder.Alias",
     "type": "final class",
     "use_selection": null,
-    "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Builder.Alias",
+    "extendsinterfaces": null,
+    "namespace": "[[[NamespacePrefix]]]\\Joomla\\Componentbuilder.Compiler.Builder.Alias",
     "description": "Alias Builder Class\r\n\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
     "head": "",
diff --git a/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/README.md b/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/README.md
index 44cb86d..912b5b3 100644
--- a/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/README.md
+++ b/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/README.md
@@ -8,6 +8,7 @@
 ```
 # class Plantuml (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Power**
+> extends: ****
 ```uml
 @startuml
 class Plantuml  #Gold {
diff --git a/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/settings.json b/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/settings.json
index 3d4d388..0efb277 100644
--- a/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/settings.json
+++ b/src/ff5e9e63-86d0-4691-ab59-d4b9d9154096/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "0",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "ff5e9e63-86d0-4691-ab59-d4b9d9154096",
     "implements": null,
     "load_selection": null,
@@ -10,6 +10,7 @@
     "system_name": "JCB.Compiler.Power.Plantuml",
     "type": "class",
     "use_selection": null,
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Power.Plantuml",
     "description": "Compiler Power Plantuml Builder\r\n@since 3.2.0",
     "licensing_template": "\/**\r\n * @package    Joomla.Component.Builder\r\n *\r\n * @created    4th September, 2022\r\n * @author     Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git        Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license    GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
diff --git a/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/README.md b/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/README.md
index 67b8b24..d9b7d39 100644
--- a/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/README.md
+++ b/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/README.md
@@ -8,6 +8,7 @@
 ```
 # class Templatelayout (Details)
 > namespace: **VDM\Joomla\Componentbuilder\Compiler\Service**
+> extends: ****
 ```uml
 @startuml
 class Templatelayout  #Gold {
diff --git a/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/settings.json b/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/settings.json
index d5a0460..91d0667 100644
--- a/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/settings.json
+++ b/src/fff3255d-c493-4c21-a48f-73b3ebf8ba05/settings.json
@@ -1,7 +1,7 @@
 {
     "add_head": "1",
     "add_licensing_template": "2",
-    "extends": "0",
+    "extends": "",
     "guid": "fff3255d-c493-4c21-a48f-73b3ebf8ba05",
     "implements": [
         "-1"
@@ -21,6 +21,7 @@
             "as": "AliasData"
         }
     },
+    "extendsinterfaces": null,
     "namespace": "VDM\\Joomla\\Componentbuilder.Compiler.Service.Templatelayout",
     "description": "Compiler Templatelayout\r\n\r\n@since 3.2.0",
     "implements_custom": "ServiceProviderInterface",
diff --git a/super-powers.json b/super-powers.json
index 9189ac3..a213eac 100644
--- a/super-powers.json
+++ b/super-powers.json
@@ -87,17 +87,6 @@
         "spk": "Super__05448890_e324_41a0_b6db_d804bfc241cc__Power",
         "guid": "05448890-e324-41a0-b6db-d804bfc241cc"
     },
-    "05744dd3-4030-4cf8-8dda-a93ab809b473": {
-        "name": "Load",
-        "type": "final class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Model",
-        "code": "src\/05744dd3-4030-4cf8-8dda-a93ab809b473\/code.php",
-        "power": "src\/05744dd3-4030-4cf8-8dda-a93ab809b473\/code.power",
-        "settings": "src\/05744dd3-4030-4cf8-8dda-a93ab809b473\/settings.json",
-        "path": "src\/05744dd3-4030-4cf8-8dda-a93ab809b473",
-        "spk": "Super__05744dd3_4030_4cf8_8dda_a93ab809b473__Power",
-        "guid": "05744dd3-4030-4cf8-8dda-a93ab809b473"
-    },
     "05c49a1f-ba5b-4be1-b3d0-4a74c42f7a46": {
         "name": "Data",
         "type": "class",
@@ -494,17 +483,6 @@
         "spk": "Super__1f086665_c007_4085_b363_3a118659ff1b__Power",
         "guid": "1f086665-c007-4085-b363-3a118659ff1b"
     },
-    "1f86db0f-e271-45df-8795-3e503ec76698": {
-        "name": "Load",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Database",
-        "code": "src\/1f86db0f-e271-45df-8795-3e503ec76698\/code.php",
-        "power": "src\/1f86db0f-e271-45df-8795-3e503ec76698\/code.power",
-        "settings": "src\/1f86db0f-e271-45df-8795-3e503ec76698\/settings.json",
-        "path": "src\/1f86db0f-e271-45df-8795-3e503ec76698",
-        "spk": "Super__1f86db0f_e271_45df_8795_3e503ec76698__Power",
-        "guid": "1f86db0f-e271-45df-8795-3e503ec76698"
-    },
     "1fcb13a2-f3f0-4fa8-b8c6-ff9dc546777a": {
         "name": "ExternalInterface",
         "type": "interface",
@@ -978,17 +956,6 @@
         "spk": "Super__3730a000_ab64_477d_8b0f_70eaf71b517a__Power",
         "guid": "3730a000-ab64-477d-8b0f-70eaf71b517a"
     },
-    "380bb7a3-cdcc-4336-a699-5070cbf521a5": {
-        "name": "Insert",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Database",
-        "code": "src\/380bb7a3-cdcc-4336-a699-5070cbf521a5\/code.php",
-        "power": "src\/380bb7a3-cdcc-4336-a699-5070cbf521a5\/code.power",
-        "settings": "src\/380bb7a3-cdcc-4336-a699-5070cbf521a5\/settings.json",
-        "path": "src\/380bb7a3-cdcc-4336-a699-5070cbf521a5",
-        "spk": "Super__380bb7a3_cdcc_4336_a699_5070cbf521a5__Power",
-        "guid": "380bb7a3-cdcc-4336-a699-5070cbf521a5"
-    },
     "38e1ca3e-1908-459a-be87-9f83b292058f": {
         "name": "JoomlaPower",
         "type": "class",
@@ -1046,7 +1013,7 @@
     },
     "3ab0eba9-f37b-4b37-aec1-2e78067f2aff": {
         "name": "Super",
-        "type": "class",
+        "type": "final class",
         "namespace": "VDM\\Joomla\\Componentbuilder\\Power",
         "code": "src\/3ab0eba9-f37b-4b37-aec1-2e78067f2aff\/code.php",
         "power": "src\/3ab0eba9-f37b-4b37-aec1-2e78067f2aff\/code.power",
@@ -1374,17 +1341,6 @@
         "spk": "Super__516f93b8_5fff_41c6_aeaf_2d93180a12cc__Power",
         "guid": "516f93b8-5fff-41c6-aeaf-2d93180a12cc"
     },
-    "51de80f2-2868-4c2c-8198-ef79349e9bd7": {
-        "name": "SuperInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Interfaces",
-        "code": "src\/51de80f2-2868-4c2c-8198-ef79349e9bd7\/code.php",
-        "power": "src\/51de80f2-2868-4c2c-8198-ef79349e9bd7\/code.power",
-        "settings": "src\/51de80f2-2868-4c2c-8198-ef79349e9bd7\/settings.json",
-        "path": "src\/51de80f2-2868-4c2c-8198-ef79349e9bd7",
-        "spk": "Super__51de80f2_2868_4c2c_8198_ef79349e9bd7__Power",
-        "guid": "51de80f2-2868-4c2c-8198-ef79349e9bd7"
-    },
     "52de0ac8-bb9d-4a45-bd2a-a44c48c17ffe": {
         "name": "SiteFields",
         "type": "final class",
@@ -1671,17 +1627,6 @@
         "spk": "Super__6784dd52_0909_451a_a872_9a942a023c68__Power",
         "guid": "6784dd52-0909-451a-a872-9a942a023c68"
     },
-    "679473f6-3ea2-49d5-8273-1b29c8f0ad2b": {
-        "name": "Update",
-        "type": "final class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Database",
-        "code": "src\/679473f6-3ea2-49d5-8273-1b29c8f0ad2b\/code.php",
-        "power": "src\/679473f6-3ea2-49d5-8273-1b29c8f0ad2b\/code.power",
-        "settings": "src\/679473f6-3ea2-49d5-8273-1b29c8f0ad2b\/settings.json",
-        "path": "src\/679473f6-3ea2-49d5-8273-1b29c8f0ad2b",
-        "spk": "Super__679473f6_3ea2_49d5_8273_1b29c8f0ad2b__Power",
-        "guid": "679473f6-3ea2-49d5-8273-1b29c8f0ad2b"
-    },
     "6992384f-4f29-489f-a52e-286e03f4593b": {
         "name": "HasMenuGlobal",
         "type": "final class",
@@ -1693,17 +1638,6 @@
         "spk": "Super__6992384f_4f29_489f_a52e_286e03f4593b__Power",
         "guid": "6992384f-4f29-489f-a52e-286e03f4593b"
     },
-    "69c29be3-ab25-4f56-944e-7ada6307b10c": {
-        "name": "UpdateInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Interfaces\\Database",
-        "code": "src\/69c29be3-ab25-4f56-944e-7ada6307b10c\/code.php",
-        "power": "src\/69c29be3-ab25-4f56-944e-7ada6307b10c\/code.power",
-        "settings": "src\/69c29be3-ab25-4f56-944e-7ada6307b10c\/settings.json",
-        "path": "src\/69c29be3-ab25-4f56-944e-7ada6307b10c",
-        "spk": "Super__69c29be3_ab25_4f56_944e_7ada6307b10c__Power",
-        "guid": "69c29be3-ab25-4f56-944e-7ada6307b10c"
-    },
     "69d2b980-a665-48cd-96f8-757bf3810b41": {
         "name": "Settings",
         "type": "final class",
@@ -1847,17 +1781,6 @@
         "spk": "Super__7175c1cd_2071_4cd7_b499_23881e168c3f__Power",
         "guid": "7175c1cd-2071-4cd7-b499-23881e168c3f"
     },
-    "7243aaf6-b76c-4391-8698-50abbfc98fbe": {
-        "name": "Database",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Service",
-        "code": "src\/7243aaf6-b76c-4391-8698-50abbfc98fbe\/code.php",
-        "power": "src\/7243aaf6-b76c-4391-8698-50abbfc98fbe\/code.power",
-        "settings": "src\/7243aaf6-b76c-4391-8698-50abbfc98fbe\/settings.json",
-        "path": "src\/7243aaf6-b76c-4391-8698-50abbfc98fbe",
-        "spk": "Super__7243aaf6_b76c_4391_8698_50abbfc98fbe__Power",
-        "guid": "7243aaf6-b76c-4391-8698-50abbfc98fbe"
-    },
     "73183d13-9b2e-4879-b05a-52298d5b31f7": {
         "name": "InstallScript",
         "type": "final class",
@@ -1902,6 +1825,17 @@
         "spk": "Super__7506a35c_fa32_44ab_bd41_363439b20b82__Power",
         "guid": "7506a35c-fa32-44ab-bd41-363439b20b82"
     },
+    "7526a39a-ada3-4499-8d75-81beff33f949": {
+        "name": "Languages",
+        "type": "final class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Compiler\\Builder",
+        "code": "src\/7526a39a-ada3-4499-8d75-81beff33f949\/code.php",
+        "power": "src\/7526a39a-ada3-4499-8d75-81beff33f949\/code.power",
+        "settings": "src\/7526a39a-ada3-4499-8d75-81beff33f949\/settings.json",
+        "path": "src\/7526a39a-ada3-4499-8d75-81beff33f949",
+        "spk": "Super__7526a39a_ada3_4499_8d75_81beff33f949__Power",
+        "guid": "7526a39a-ada3-4499-8d75-81beff33f949"
+    },
     "763d137c-42bc-4282-98d8-cc5c0654985f": {
         "name": "Injector",
         "type": "class",
@@ -2001,17 +1935,6 @@
         "spk": "Super__7c07c9d6_34cd_4491_934a_ef0a83f414c0__Power",
         "guid": "7c07c9d6-34cd-4491-934a-ef0a83f414c0"
     },
-    "7c1fb50f-8fb1-4627-8705-6fedf7182ca5": {
-        "name": "Upsert",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Model",
-        "code": "src\/7c1fb50f-8fb1-4627-8705-6fedf7182ca5\/code.php",
-        "power": "src\/7c1fb50f-8fb1-4627-8705-6fedf7182ca5\/code.power",
-        "settings": "src\/7c1fb50f-8fb1-4627-8705-6fedf7182ca5\/settings.json",
-        "path": "src\/7c1fb50f-8fb1-4627-8705-6fedf7182ca5",
-        "spk": "Super__7c1fb50f_8fb1_4627_8705_6fedf7182ca5__Power",
-        "guid": "7c1fb50f-8fb1-4627-8705-6fedf7182ca5"
-    },
     "7f01622a-74c9-4e67-b111-3eb488035206": {
         "name": "Permission",
         "type": "final class",
@@ -2100,6 +2023,17 @@
         "spk": "Super__8591f6db_dd3c_4a63_9b3f_574c0ec74ade__Power",
         "guid": "8591f6db-dd3c-4a63-9b3f-574c0ec74ade"
     },
+    "85cddb24-7ee6-4d86-a0db-615f443e1aec": {
+        "name": "Repository",
+        "type": "final class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower",
+        "code": "src\/85cddb24-7ee6-4d86-a0db-615f443e1aec\/code.php",
+        "power": "src\/85cddb24-7ee6-4d86-a0db-615f443e1aec\/code.power",
+        "settings": "src\/85cddb24-7ee6-4d86-a0db-615f443e1aec\/settings.json",
+        "path": "src\/85cddb24-7ee6-4d86-a0db-615f443e1aec",
+        "spk": "Super__85cddb24_7ee6_4d86_a0db_615f443e1aec__Power",
+        "guid": "85cddb24-7ee6-4d86-a0db-615f443e1aec"
+    },
     "86ac0760-26f5-4746-9c7f-ce77860f80f8": {
         "name": "Serverinterface",
         "type": "interface",
@@ -2287,17 +2221,6 @@
         "spk": "Super__9127e428_5dee_46cb_b3a9_ab5b91ea6df3__Power",
         "guid": "9127e428-5dee-46cb-b3a9-ab5b91ea6df3"
     },
-    "9206082e-a3f7-472e-98b2-de90d06cbdcd": {
-        "name": "Upsert",
-        "type": "final class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Model",
-        "code": "src\/9206082e-a3f7-472e-98b2-de90d06cbdcd\/code.php",
-        "power": "src\/9206082e-a3f7-472e-98b2-de90d06cbdcd\/code.power",
-        "settings": "src\/9206082e-a3f7-472e-98b2-de90d06cbdcd\/settings.json",
-        "path": "src\/9206082e-a3f7-472e-98b2-de90d06cbdcd",
-        "spk": "Super__9206082e_a3f7_472e_98b2_de90d06cbdcd__Power",
-        "guid": "9206082e-a3f7-472e-98b2-de90d06cbdcd"
-    },
     "92cc3144-1d3d-45b2-b49f-c7d356950033": {
         "name": "Customtabs",
         "type": "final class",
@@ -2375,17 +2298,6 @@
         "spk": "Super__9551b683_67b6_4367_bb14_4b016def37e3__Power",
         "guid": "9551b683-67b6-4367-bb14-4b016def37e3"
     },
-    "95c02df3-fe0a-405b-b506-b7a5b8605b66": {
-        "name": "InsertInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Interfaces\\Database",
-        "code": "src\/95c02df3-fe0a-405b-b506-b7a5b8605b66\/code.php",
-        "power": "src\/95c02df3-fe0a-405b-b506-b7a5b8605b66\/code.power",
-        "settings": "src\/95c02df3-fe0a-405b-b506-b7a5b8605b66\/settings.json",
-        "path": "src\/95c02df3-fe0a-405b-b506-b7a5b8605b66",
-        "spk": "Super__95c02df3_fe0a_405b_b506_b7a5b8605b66__Power",
-        "guid": "95c02df3-fe0a-405b-b506-b7a5b8605b66"
-    },
     "95d0e03f-24fd-4412-bc2e-f0899fcc3205": {
         "name": "Parser",
         "type": "final class",
@@ -2485,17 +2397,6 @@
         "spk": "Super__99368a6f_2f64_4d4e_ad3a_544d4020ecc6__Power",
         "guid": "99368a6f-2f64-4d4e-ad3a-544d4020ecc6"
     },
-    "99786f53-64b7-4d52-95b0-5306e7386c3f": {
-        "name": "LoadInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Database",
-        "code": "src\/99786f53-64b7-4d52-95b0-5306e7386c3f\/code.php",
-        "power": "src\/99786f53-64b7-4d52-95b0-5306e7386c3f\/code.power",
-        "settings": "src\/99786f53-64b7-4d52-95b0-5306e7386c3f\/settings.json",
-        "path": "src\/99786f53-64b7-4d52-95b0-5306e7386c3f",
-        "spk": "Super__99786f53_64b7_4d52_95b0_5306e7386c3f__Power",
-        "guid": "99786f53-64b7-4d52-95b0-5306e7386c3f"
-    },
     "9b5872d6-c1d8-4602-b443-5844d2c950ee": {
         "name": "AssetsRules",
         "type": "final class",
@@ -2540,17 +2441,6 @@
         "spk": "Super__9d1eec29_f304_4b08_a3e7_8b2d6b1f4a1f__Power",
         "guid": "9d1eec29-f304-4b08-a3e7-8b2d6b1f4a1f"
     },
-    "9d53d45e-9b4d-45ec-827b-4916b91c907e": {
-        "name": "Insert",
-        "type": "final class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Database",
-        "code": "src\/9d53d45e-9b4d-45ec-827b-4916b91c907e\/code.php",
-        "power": "src\/9d53d45e-9b4d-45ec-827b-4916b91c907e\/code.power",
-        "settings": "src\/9d53d45e-9b4d-45ec-827b-4916b91c907e\/settings.json",
-        "path": "src\/9d53d45e-9b4d-45ec-827b-4916b91c907e",
-        "spk": "Super__9d53d45e_9b4d_45ec_827b_4916b91c907e__Power",
-        "guid": "9d53d45e-9b4d-45ec-827b-4916b91c907e"
-    },
     "9d74d613-5ef7-4cf1-9f12-64f0a8e19806": {
         "name": "CustomAlias",
         "type": "final class",
@@ -2628,17 +2518,6 @@
         "spk": "Super__a1e551a9_8369_48c9_a076_4e5beb65e0df__Power",
         "guid": "a1e551a9-8369-48c9-a076-4e5beb65e0df"
     },
-    "a2992a91-eec2-4957-811b-8cde22aa1438": {
-        "name": "Database",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Service",
-        "code": "src\/a2992a91-eec2-4957-811b-8cde22aa1438\/code.php",
-        "power": "src\/a2992a91-eec2-4957-811b-8cde22aa1438\/code.power",
-        "settings": "src\/a2992a91-eec2-4957-811b-8cde22aa1438\/settings.json",
-        "path": "src\/a2992a91-eec2-4957-811b-8cde22aa1438",
-        "spk": "Super__a2992a91_eec2_4957_811b_8cde22aa1438__Power",
-        "guid": "a2992a91-eec2-4957-811b-8cde22aa1438"
-    },
     "a356d103-74f3-49ca-8e4f-3bd37746f089": {
         "name": "Customcode",
         "type": "class",
@@ -2947,17 +2826,6 @@
         "spk": "Super__b3c36de1_9b18_4ea8_8383_6ab8f0e33996__Power",
         "guid": "b3c36de1-9b18-4ea8-8383-6ab8f0e33996"
     },
-    "b4ea5de3-653f-43f9-b927-4ba6456b4d0a": {
-        "name": "Load",
-        "type": "final class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\JoomlaPower\\Database",
-        "code": "src\/b4ea5de3-653f-43f9-b927-4ba6456b4d0a\/code.php",
-        "power": "src\/b4ea5de3-653f-43f9-b927-4ba6456b4d0a\/code.power",
-        "settings": "src\/b4ea5de3-653f-43f9-b927-4ba6456b4d0a\/settings.json",
-        "path": "src\/b4ea5de3-653f-43f9-b927-4ba6456b4d0a",
-        "spk": "Super__b4ea5de3_653f_43f9_b927_4ba6456b4d0a__Power",
-        "guid": "b4ea5de3-653f-43f9-b927-4ba6456b4d0a"
-    },
     "b5986fab-17ca-4236-8c0c-81ebd2bb82ba": {
         "name": "FieldsetDynamic",
         "type": "final class",
@@ -3057,17 +2925,6 @@
         "spk": "Super__bb26cf63_69a5_4c43_b2df_43284c9d907d__Power",
         "guid": "bb26cf63-69a5-4c43-b2df-43284c9d907d"
     },
-    "bb29a833-73f7-4283-9327-bc7e41f0723b": {
-        "name": "Load",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Model",
-        "code": "src\/bb29a833-73f7-4283-9327-bc7e41f0723b\/code.php",
-        "power": "src\/bb29a833-73f7-4283-9327-bc7e41f0723b\/code.power",
-        "settings": "src\/bb29a833-73f7-4283-9327-bc7e41f0723b\/settings.json",
-        "path": "src\/bb29a833-73f7-4283-9327-bc7e41f0723b",
-        "spk": "Super__bb29a833_73f7_4283_9327_bc7e41f0723b__Power",
-        "guid": "bb29a833-73f7-4283-9327-bc7e41f0723b"
-    },
     "bbd36fbf-d905-47e8-8e67-9ea6ec734712": {
         "name": "ArchitectureModel",
         "type": "class",
@@ -3156,17 +3013,6 @@
         "spk": "Super__c159425c_51f9_4a15_af99_f2d0c6d7aae8__Power",
         "guid": "c159425c-51f9-4a15-af99-f2d0c6d7aae8"
     },
-    "c182506a-ab84-439c-b962-1e606b58d545": {
-        "name": "GrepInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Interfaces",
-        "code": "src\/c182506a-ab84-439c-b962-1e606b58d545\/code.php",
-        "power": "src\/c182506a-ab84-439c-b962-1e606b58d545\/code.power",
-        "settings": "src\/c182506a-ab84-439c-b962-1e606b58d545\/settings.json",
-        "path": "src\/c182506a-ab84-439c-b962-1e606b58d545",
-        "spk": "Super__c182506a_ab84_439c_b962_1e606b58d545__Power",
-        "guid": "c182506a-ab84-439c-b962-1e606b58d545"
-    },
     "c20a63e0-0eeb-4424-9d08-b1bf0f049dfe": {
         "name": "Phpadminview",
         "type": "class",
@@ -3189,6 +3035,17 @@
         "spk": "Super__c600f58c_3fe2_4d2d_b711_2660eab6effe__Power",
         "guid": "c600f58c-3fe2-4d2d-b711-2660eab6effe"
     },
+    "c6619b00-261c-473b-8094-d4fe9e6bab39": {
+        "name": "RepoHelper",
+        "type": "abstract class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Utilities",
+        "code": "src\/c6619b00-261c-473b-8094-d4fe9e6bab39\/code.php",
+        "power": "src\/c6619b00-261c-473b-8094-d4fe9e6bab39\/code.power",
+        "settings": "src\/c6619b00-261c-473b-8094-d4fe9e6bab39\/settings.json",
+        "path": "src\/c6619b00-261c-473b-8094-d4fe9e6bab39",
+        "spk": "Super__c6619b00_261c_473b_8094_d4fe9e6bab39__Power",
+        "guid": "c6619b00-261c-473b-8094-d4fe9e6bab39"
+    },
     "c6818275-cdf7-4fce-a365-90d95a77a71c": {
         "name": "CoreField",
         "type": "final class",
@@ -3343,6 +3200,17 @@
         "spk": "Super__cdc9b06d_8333_4fa7_ab4d_b810dd90f95f__Power",
         "guid": "cdc9b06d-8333-4fa7-ab4d-b810dd90f95f"
     },
+    "cddcac51-9a46-47c4-ba59-105c70453bd6": {
+        "name": "FilterHelper",
+        "type": "abstract class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Utilities",
+        "code": "src\/cddcac51-9a46-47c4-ba59-105c70453bd6\/code.php",
+        "power": "src\/cddcac51-9a46-47c4-ba59-105c70453bd6\/code.power",
+        "settings": "src\/cddcac51-9a46-47c4-ba59-105c70453bd6\/settings.json",
+        "path": "src\/cddcac51-9a46-47c4-ba59-105c70453bd6",
+        "spk": "Super__cddcac51_9a46_47c4_ba59_105c70453bd6__Power",
+        "guid": "cddcac51-9a46-47c4-ba59-105c70453bd6"
+    },
     "ce0899a9-6271-4fc4-800a-697c122bb112": {
         "name": "DatabaseUniqueKeys",
         "type": "final class",
@@ -3717,17 +3585,6 @@
         "spk": "Super__e5278bf3_6dfb_42a0_b699_148b5ab8e45f__Power",
         "guid": "e5278bf3-6dfb-42a0-b699-148b5ab8e45f"
     },
-    "e543c123-b1d9-4a0b-83b2-a9d371da5ff3": {
-        "name": "Update",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Power\\Database",
-        "code": "src\/e543c123-b1d9-4a0b-83b2-a9d371da5ff3\/code.php",
-        "power": "src\/e543c123-b1d9-4a0b-83b2-a9d371da5ff3\/code.power",
-        "settings": "src\/e543c123-b1d9-4a0b-83b2-a9d371da5ff3\/settings.json",
-        "path": "src\/e543c123-b1d9-4a0b-83b2-a9d371da5ff3",
-        "spk": "Super__e543c123_b1d9_4a0b_83b2_a9d371da5ff3__Power",
-        "guid": "e543c123-b1d9-4a0b-83b2-a9d371da5ff3"
-    },
     "e54965e7-34fd-481e-b40c-4da089afec5a": {
         "name": "HasPermissions",
         "type": "final class",