diff --git a/README.md b/README.md
index 8d6642b..7be6538 100644
--- a/README.md
+++ b/README.md
@@ -8,24 +8,24 @@ Demonstration of subform super power
 + *Author*: [Oh Martin](mailto:oh@nampharm.com.na)
 + *Name*: [Subform Power](https://nampharm.com.na)
 + *First Build*: 24th May, 2024
-+ *Last Build*: 20th August, 2024
++ *Last Build*: 21st August, 2024
 + *Version*: 1.0.1
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 ## Build Time
 
-**71 Hours** or **9 Eight Hour Days**  (actual time the author saved - 
+**72 Hours** or **9 Eight Hour Days**  (actual time the author saved - 
 due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **25284**
-+ *File count*: **234**
-+ *Folder count*: **81**
++ *Line count*: **25804**
++ *File count*: **246**
++ *Folder count*: **85**
 
-**46 Hours** or **6 Eight Hour Days** (the actual time the author spent)
+**48 Hours** or **6 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @18hours** = codingtime / 4;
@@ -33,7 +33,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > **mapping @7hours** = codingtime / 10;
 > **office @12hours** = codingtime / 6;)
 
-**117 Hours** or **15 Eight Hour Days**
+**120 Hours** or **15 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
diff --git a/SubformpowerInstallerPowerloader.php b/SubformpowerInstallerPowerloader.php
index 66c26d8..ef9d5fc 100644
--- a/SubformpowerInstallerPowerloader.php
+++ b/SubformpowerInstallerPowerloader.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerInstallerPowerloader.php
diff --git a/SubformpowerInstallerScript.php b/SubformpowerInstallerScript.php
index 6454653..623b7ed 100644
--- a/SubformpowerInstallerScript.php
+++ b/SubformpowerInstallerScript.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerInstallerScript.php
diff --git a/admin/README.txt b/admin/README.txt
index 8d6642b..7be6538 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -8,24 +8,24 @@ Demonstration of subform super power
 + *Author*: [Oh Martin](mailto:oh@nampharm.com.na)
 + *Name*: [Subform Power](https://nampharm.com.na)
 + *First Build*: 24th May, 2024
-+ *Last Build*: 20th August, 2024
++ *Last Build*: 21st August, 2024
 + *Version*: 1.0.1
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 ## Build Time
 
-**71 Hours** or **9 Eight Hour Days**  (actual time the author saved - 
+**72 Hours** or **9 Eight Hour Days**  (actual time the author saved - 
 due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
 > never making one mistake or taking any coffee break.)
 
-+ *Line count*: **25284**
-+ *File count*: **234**
-+ *Folder count*: **81**
++ *Line count*: **25804**
++ *File count*: **246**
++ *Folder count*: **85**
 
-**46 Hours** or **6 Eight Hour Days** (the actual time the author spent)
+**48 Hours** or **6 Eight Hour Days** (the actual time the author spent)
 
 > (with the following break down:
 > **debugging @18hours** = codingtime / 4;
@@ -33,7 +33,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com))
 > **mapping @7hours** = codingtime / 10;
 > **office @12hours** = codingtime / 6;)
 
-**117 Hours** or **15 Eight Hour Days**
+**120 Hours** or **15 Eight Hour Days**
 (a total of the realistic time frame for this project)
 
 > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index d8806ca..a1cd2fe 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		admin.css
diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css
index ecbd9d7..6dda8cc 100644
--- a/admin/assets/css/countries.css
+++ b/admin/assets/css/countries.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		countries.css
diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css
index 7d66264..5bf6cd9 100644
--- a/admin/assets/css/country.css
+++ b/admin/assets/css/country.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		country.css
diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css
index ec26b4f..53169e4 100644
--- a/admin/assets/css/currencies.css
+++ b/admin/assets/css/currencies.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		currencies.css
diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css
index 50a2d2f..06db944 100644
--- a/admin/assets/css/currency.css
+++ b/admin/assets/css/currency.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		currency.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index defacac..2f8d8f3 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		dashboard.css
diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js
index 707338b..450f1f5 100644
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		admin.js
diff --git a/admin/layouts/country/currencies_fullwidth.php b/admin/layouts/country/currencies_fullwidth.php
index d1d04a9..bb26d4f 100644
--- a/admin/layouts/country/currencies_fullwidth.php
+++ b/admin/layouts/country/currencies_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		currencies_fullwidth.php
diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php
index 6447281..5560275 100644
--- a/admin/layouts/country/details_above.php
+++ b/admin/layouts/country/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_above.php
diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php
index e3d1d75..7ac4fcd 100644
--- a/admin/layouts/country/details_left.php
+++ b/admin/layouts/country/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_left.php
diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php
index b0c0d40..db70134 100644
--- a/admin/layouts/country/details_right.php
+++ b/admin/layouts/country/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_right.php
diff --git a/admin/layouts/country/more_stuff_fullwidth.php b/admin/layouts/country/more_stuff_fullwidth.php
index 921783b..67456bb 100644
--- a/admin/layouts/country/more_stuff_fullwidth.php
+++ b/admin/layouts/country/more_stuff_fullwidth.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		more_stuff_fullwidth.php
diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php
index 4440d2d..afe11bb 100644
--- a/admin/layouts/country/publishing.php
+++ b/admin/layouts/country/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		publishing.php
diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php
index 1f2274b..0620536 100644
--- a/admin/layouts/country/publlshing.php
+++ b/admin/layouts/country/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		publlshing.php
diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php
index 2dfc438..2729eda 100644
--- a/admin/layouts/currency/details_above.php
+++ b/admin/layouts/currency/details_above.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_above.php
diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php
index 08b1428..38b93eb 100644
--- a/admin/layouts/currency/details_left.php
+++ b/admin/layouts/currency/details_left.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_left.php
diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php
index 3e58b3c..8dd8997 100644
--- a/admin/layouts/currency/details_right.php
+++ b/admin/layouts/currency/details_right.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		details_right.php
diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php
index 4440d2d..afe11bb 100644
--- a/admin/layouts/currency/publishing.php
+++ b/admin/layouts/currency/publishing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		publishing.php
diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php
index 1f2274b..0620536 100644
--- a/admin/layouts/currency/publlshing.php
+++ b/admin/layouts/currency/publlshing.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		publlshing.php
diff --git a/admin/services/provider.php b/admin/services/provider.php
index d529e2a..4dac2ca 100644
--- a/admin/services/provider.php
+++ b/admin/services/provider.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		provider.php
diff --git a/admin/src/Controller/CountriesController.php b/admin/src/Controller/CountriesController.php
index 381379a..b2997ce 100644
--- a/admin/src/Controller/CountriesController.php
+++ b/admin/src/Controller/CountriesController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesController.php
diff --git a/admin/src/Controller/CountryController.php b/admin/src/Controller/CountryController.php
index 0a86a9e..d85253a 100644
--- a/admin/src/Controller/CountryController.php
+++ b/admin/src/Controller/CountryController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountryController.php
diff --git a/admin/src/Controller/CurrenciesController.php b/admin/src/Controller/CurrenciesController.php
index 4619062..ec47ccf 100644
--- a/admin/src/Controller/CurrenciesController.php
+++ b/admin/src/Controller/CurrenciesController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrenciesController.php
diff --git a/admin/src/Controller/CurrencyController.php b/admin/src/Controller/CurrencyController.php
index 05bb25c..014afde 100644
--- a/admin/src/Controller/CurrencyController.php
+++ b/admin/src/Controller/CurrencyController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrencyController.php
diff --git a/admin/src/Controller/DisplayController.php b/admin/src/Controller/DisplayController.php
index 057247b..d99aca4 100644
--- a/admin/src/Controller/DisplayController.php
+++ b/admin/src/Controller/DisplayController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		DisplayController.php
diff --git a/admin/src/Controller/ImportController.php b/admin/src/Controller/ImportController.php
index 8a9d427..fa3ce79 100644
--- a/admin/src/Controller/ImportController.php
+++ b/admin/src/Controller/ImportController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		ImportController.php
diff --git a/admin/src/Controller/SubformpowerController.php b/admin/src/Controller/SubformpowerController.php
index 5c1ec44..5ef6ebc 100644
--- a/admin/src/Controller/SubformpowerController.php
+++ b/admin/src/Controller/SubformpowerController.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerController.php
diff --git a/admin/src/Extension/SubformpowerComponent.php b/admin/src/Extension/SubformpowerComponent.php
index e053f90..2d719d7 100644
--- a/admin/src/Extension/SubformpowerComponent.php
+++ b/admin/src/Extension/SubformpowerComponent.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerComponent.php
diff --git a/admin/src/Field/CountriesField.php b/admin/src/Field/CountriesField.php
index 41f9bbe..c6742f2 100644
--- a/admin/src/Field/CountriesField.php
+++ b/admin/src/Field/CountriesField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesField.php
diff --git a/admin/src/Field/CountriesfilterisoField.php b/admin/src/Field/CountriesfilterisoField.php
index aedf96e..3a36d1d 100644
--- a/admin/src/Field/CountriesfilterisoField.php
+++ b/admin/src/Field/CountriesfilterisoField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesfilterisoField.php
diff --git a/admin/src/Field/CountriesfilterisothreeField.php b/admin/src/Field/CountriesfilterisothreeField.php
index 78e7840..4914b24 100644
--- a/admin/src/Field/CountriesfilterisothreeField.php
+++ b/admin/src/Field/CountriesfilterisothreeField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesfilterisothreeField.php
diff --git a/admin/src/Field/CountriesfilternumcodeField.php b/admin/src/Field/CountriesfilternumcodeField.php
index 1f86520..51565e2 100644
--- a/admin/src/Field/CountriesfilternumcodeField.php
+++ b/admin/src/Field/CountriesfilternumcodeField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesfilternumcodeField.php
diff --git a/admin/src/Field/CountriesfilterphonecodeField.php b/admin/src/Field/CountriesfilterphonecodeField.php
index 16be64b..4db796d 100644
--- a/admin/src/Field/CountriesfilterphonecodeField.php
+++ b/admin/src/Field/CountriesfilterphonecodeField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesfilterphonecodeField.php
diff --git a/admin/src/Field/CurrenciesfiltersymbolField.php b/admin/src/Field/CurrenciesfiltersymbolField.php
index 0343eb0..e78700e 100644
--- a/admin/src/Field/CurrenciesfiltersymbolField.php
+++ b/admin/src/Field/CurrenciesfiltersymbolField.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrenciesfiltersymbolField.php
diff --git a/admin/src/Helper/HeaderCheck.php b/admin/src/Helper/HeaderCheck.php
index f488095..077bb1a 100644
--- a/admin/src/Helper/HeaderCheck.php
+++ b/admin/src/Helper/HeaderCheck.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HeaderCheck.php
diff --git a/admin/src/Helper/PowerloaderHelper.php b/admin/src/Helper/PowerloaderHelper.php
index a6827cc..73dd223 100644
--- a/admin/src/Helper/PowerloaderHelper.php
+++ b/admin/src/Helper/PowerloaderHelper.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		PowerloaderHelper.php
diff --git a/admin/src/Helper/SubformpowerHelper.php b/admin/src/Helper/SubformpowerHelper.php
index a52260e..234a689 100644
--- a/admin/src/Helper/SubformpowerHelper.php
+++ b/admin/src/Helper/SubformpowerHelper.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerHelper.php
diff --git a/admin/src/Model/CountriesModel.php b/admin/src/Model/CountriesModel.php
index 04f0a70..152f280 100644
--- a/admin/src/Model/CountriesModel.php
+++ b/admin/src/Model/CountriesModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountriesModel.php
diff --git a/admin/src/Model/CountryModel.php b/admin/src/Model/CountryModel.php
index 69e81b5..4c8ce35 100644
--- a/admin/src/Model/CountryModel.php
+++ b/admin/src/Model/CountryModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountryModel.php
diff --git a/admin/src/Model/CurrenciesModel.php b/admin/src/Model/CurrenciesModel.php
index 6e45598..0d05058 100644
--- a/admin/src/Model/CurrenciesModel.php
+++ b/admin/src/Model/CurrenciesModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrenciesModel.php
diff --git a/admin/src/Model/CurrencyModel.php b/admin/src/Model/CurrencyModel.php
index d127ab8..c4e249a 100644
--- a/admin/src/Model/CurrencyModel.php
+++ b/admin/src/Model/CurrencyModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrencyModel.php
diff --git a/admin/src/Model/ImportModel.php b/admin/src/Model/ImportModel.php
index a17a3bc..4d55673 100644
--- a/admin/src/Model/ImportModel.php
+++ b/admin/src/Model/ImportModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		ImportModel.php
diff --git a/admin/src/Model/SubformpowerModel.php b/admin/src/Model/SubformpowerModel.php
index b061519..e14d007 100644
--- a/admin/src/Model/SubformpowerModel.php
+++ b/admin/src/Model/SubformpowerModel.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		SubformpowerModel.php
diff --git a/admin/src/Rule/GuidRule.php b/admin/src/Rule/GuidRule.php
index 88e80ed..6be40d4 100644
--- a/admin/src/Rule/GuidRule.php
+++ b/admin/src/Rule/GuidRule.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		GuidRule.php
diff --git a/admin/src/Table/CountryTable.php b/admin/src/Table/CountryTable.php
index e21feea..d9d8c56 100644
--- a/admin/src/Table/CountryTable.php
+++ b/admin/src/Table/CountryTable.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CountryTable.php
diff --git a/admin/src/Table/CurrencyTable.php b/admin/src/Table/CurrencyTable.php
index c411ad6..3cfb68b 100644
--- a/admin/src/Table/CurrencyTable.php
+++ b/admin/src/Table/CurrencyTable.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		CurrencyTable.php
diff --git a/admin/src/View/Countries/HtmlView.php b/admin/src/View/Countries/HtmlView.php
index 1cf2be8..727afce 100644
--- a/admin/src/View/Countries/HtmlView.php
+++ b/admin/src/View/Countries/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/src/View/Country/HtmlView.php b/admin/src/View/Country/HtmlView.php
index 348e4ca..573dc7d 100644
--- a/admin/src/View/Country/HtmlView.php
+++ b/admin/src/View/Country/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/src/View/Currencies/HtmlView.php b/admin/src/View/Currencies/HtmlView.php
index 136cb31..0aa19db 100644
--- a/admin/src/View/Currencies/HtmlView.php
+++ b/admin/src/View/Currencies/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/src/View/Currency/HtmlView.php b/admin/src/View/Currency/HtmlView.php
index 0387ecc..b6b8b55 100644
--- a/admin/src/View/Currency/HtmlView.php
+++ b/admin/src/View/Currency/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/src/View/Import/HtmlView.php b/admin/src/View/Import/HtmlView.php
index 4fbac1a..8fa617d 100644
--- a/admin/src/View/Import/HtmlView.php
+++ b/admin/src/View/Import/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/src/View/Subformpower/HtmlView.php b/admin/src/View/Subformpower/HtmlView.php
index bf76612..f319c1e 100644
--- a/admin/src/View/Subformpower/HtmlView.php
+++ b/admin/src/View/Subformpower/HtmlView.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		HtmlView.php
diff --git a/admin/tmpl/countries/default.php b/admin/tmpl/countries/default.php
index d7f42cb..2101252 100644
--- a/admin/tmpl/countries/default.php
+++ b/admin/tmpl/countries/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/countries/default_body.php b/admin/tmpl/countries/default_body.php
index 961d8e6..6e0647d 100644
--- a/admin/tmpl/countries/default_body.php
+++ b/admin/tmpl/countries/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_body.php
diff --git a/admin/tmpl/countries/default_foot.php b/admin/tmpl/countries/default_foot.php
index 155c165..0a03456 100644
--- a/admin/tmpl/countries/default_foot.php
+++ b/admin/tmpl/countries/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_foot.php
diff --git a/admin/tmpl/countries/default_head.php b/admin/tmpl/countries/default_head.php
index 3b89d1c..5c2fa6b 100644
--- a/admin/tmpl/countries/default_head.php
+++ b/admin/tmpl/countries/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_head.php
diff --git a/admin/tmpl/countries/default_toolbar.php b/admin/tmpl/countries/default_toolbar.php
index e46e632..48f0c5b 100644
--- a/admin/tmpl/countries/default_toolbar.php
+++ b/admin/tmpl/countries/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_toolbar.php
diff --git a/admin/tmpl/countries/emptystate.php b/admin/tmpl/countries/emptystate.php
index 7df10bc..d6e8aa5 100644
--- a/admin/tmpl/countries/emptystate.php
+++ b/admin/tmpl/countries/emptystate.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		emptystate.php
diff --git a/admin/tmpl/country/default.php b/admin/tmpl/country/default.php
index f43e75d..52322c7 100644
--- a/admin/tmpl/country/default.php
+++ b/admin/tmpl/country/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/currencies/default.php b/admin/tmpl/currencies/default.php
index a6341ae..f91142c 100644
--- a/admin/tmpl/currencies/default.php
+++ b/admin/tmpl/currencies/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/currencies/default_body.php b/admin/tmpl/currencies/default_body.php
index 7207d45..0a76b9d 100644
--- a/admin/tmpl/currencies/default_body.php
+++ b/admin/tmpl/currencies/default_body.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_body.php
diff --git a/admin/tmpl/currencies/default_foot.php b/admin/tmpl/currencies/default_foot.php
index 93a4634..d690a91 100644
--- a/admin/tmpl/currencies/default_foot.php
+++ b/admin/tmpl/currencies/default_foot.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_foot.php
diff --git a/admin/tmpl/currencies/default_head.php b/admin/tmpl/currencies/default_head.php
index b586377..fdb3c2e 100644
--- a/admin/tmpl/currencies/default_head.php
+++ b/admin/tmpl/currencies/default_head.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_head.php
diff --git a/admin/tmpl/currencies/default_toolbar.php b/admin/tmpl/currencies/default_toolbar.php
index 8880f21..e956805 100644
--- a/admin/tmpl/currencies/default_toolbar.php
+++ b/admin/tmpl/currencies/default_toolbar.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_toolbar.php
diff --git a/admin/tmpl/currencies/emptystate.php b/admin/tmpl/currencies/emptystate.php
index f6b6c5e..0caeac0 100644
--- a/admin/tmpl/currencies/emptystate.php
+++ b/admin/tmpl/currencies/emptystate.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		emptystate.php
diff --git a/admin/tmpl/currency/default.php b/admin/tmpl/currency/default.php
index f6f0a66..3cf4d54 100644
--- a/admin/tmpl/currency/default.php
+++ b/admin/tmpl/currency/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/import/default.php b/admin/tmpl/import/default.php
index 7b2233e..cecf923 100644
--- a/admin/tmpl/import/default.php
+++ b/admin/tmpl/import/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/subformpower/default.php b/admin/tmpl/subformpower/default.php
index 37e8283..5d94879 100644
--- a/admin/tmpl/subformpower/default.php
+++ b/admin/tmpl/subformpower/default.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default.php
diff --git a/admin/tmpl/subformpower/default_main.php b/admin/tmpl/subformpower/default_main.php
index 411aba7..763b602 100644
--- a/admin/tmpl/subformpower/default_main.php
+++ b/admin/tmpl/subformpower/default_main.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_main.php
diff --git a/admin/tmpl/subformpower/default_vdm.php b/admin/tmpl/subformpower/default_vdm.php
index 7cb657a..337e4a5 100644
--- a/admin/tmpl/subformpower/default_vdm.php
+++ b/admin/tmpl/subformpower/default_vdm.php
@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		default_vdm.php
diff --git a/api/index.html b/api/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/Controller/CountriesController.php b/api/src/Controller/CountriesController.php
new file mode 100644
index 0000000..48d9889
--- /dev/null
+++ b/api/src/Controller/CountriesController.php
@@ -0,0 +1,51 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		CountriesController.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\Controller;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\ApiController;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Countries Api Controller
+ *
+ * @since  4.0.0
+ */
+class CountriesController extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = 'countries';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = 'countries';
+}
\ No newline at end of file
diff --git a/api/src/Controller/CountryController.php b/api/src/Controller/CountryController.php
new file mode 100644
index 0000000..e0259e2
--- /dev/null
+++ b/api/src/Controller/CountryController.php
@@ -0,0 +1,138 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		CountryController.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\Controller;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\ApiController;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Country Api Controller
+ *
+ * @since  4.0.0
+ */
+class CountryController extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = 'country';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = 'country';
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = [])
+	{
+		// Get user object.
+		$user = $this->app->getIdentity();
+		// Access check.
+		$access = $user->authorise('country.access', 'com_subformpower');
+		if (!$access)
+		{
+			return false;
+		}
+
+		// In the absence of better information, revert to the component permissions.
+		return $user->authorise('country.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = [], $key = 'id')
+	{
+		// get user object.
+		$user = $this->app->getIdentity();
+		// get record id.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('country.access', 'com_subformpower.country.' . (int) $recordId) && $user->authorise('country.access', 'com_subformpower'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('country.edit', 'com_subformpower.country.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('country.edit.own', 'com_subformpower.country.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('country.edit.own', 'com_subformpower'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('country.edit', $this->option);
+	}
+}
diff --git a/api/src/Controller/CurrenciesController.php b/api/src/Controller/CurrenciesController.php
new file mode 100644
index 0000000..99742a0
--- /dev/null
+++ b/api/src/Controller/CurrenciesController.php
@@ -0,0 +1,51 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		CurrenciesController.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\Controller;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\ApiController;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Currencies Api Controller
+ *
+ * @since  4.0.0
+ */
+class CurrenciesController extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = 'currencies';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = 'currencies';
+}
\ No newline at end of file
diff --git a/api/src/Controller/CurrencyController.php b/api/src/Controller/CurrencyController.php
new file mode 100644
index 0000000..f0b66c2
--- /dev/null
+++ b/api/src/Controller/CurrencyController.php
@@ -0,0 +1,138 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		CurrencyController.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\Controller;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\ApiController;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Currency Api Controller
+ *
+ * @since  4.0.0
+ */
+class CurrencyController extends ApiController
+{
+	/**
+	 * The content type of the item.
+	 *
+	 * @var    string
+	 * @since  4.0.0
+	 */
+	protected $contentType = 'currency';
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view = 'currency';
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = [])
+	{
+		// Get user object.
+		$user = $this->app->getIdentity();
+		// Access check.
+		$access = $user->authorise('currency.access', 'com_subformpower');
+		if (!$access)
+		{
+			return false;
+		}
+
+		// In the absence of better information, revert to the component permissions.
+		return $user->authorise('currency.create', $this->option);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = [], $key = 'id')
+	{
+		// get user object.
+		$user = $this->app->getIdentity();
+		// get record id.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+
+		// Access check.
+		$access = ($user->authorise('currency.access', 'com_subformpower.currency.' . (int) $recordId) && $user->authorise('currency.access', 'com_subformpower'));
+		if (!$access)
+		{
+			return false;
+		}
+
+		if ($recordId)
+		{
+			// The record has been set. Check the record permissions.
+			$permission = $user->authorise('currency.edit', 'com_subformpower.currency.' . (int) $recordId);
+			if (!$permission)
+			{
+				if ($user->authorise('currency.edit.own', 'com_subformpower.currency.' . $recordId))
+				{
+					// Now test the owner is the user.
+					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+					if (empty($ownerId))
+					{
+						// Need to do a lookup from the model.
+						$record = $this->getModel()->getItem($recordId);
+
+						if (empty($record))
+						{
+							return false;
+						}
+						$ownerId = $record->created_by;
+					}
+
+					// If the owner matches 'me' then allow.
+					if ($ownerId == $user->id)
+					{
+						if ($user->authorise('currency.edit.own', 'com_subformpower'))
+						{
+							return true;
+						}
+					}
+				}
+				return false;
+			}
+		}
+		// Since there is no permission, revert to the component permissions.
+		return $user->authorise('currency.edit', $this->option);
+	}
+}
diff --git a/api/src/Controller/index.html b/api/src/Controller/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/Controller/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/View/Countries/JsonapiView.php b/api/src/View/Countries/JsonapiView.php
new file mode 100644
index 0000000..235a483
--- /dev/null
+++ b/api/src/View/Countries/JsonapiView.php
@@ -0,0 +1,36 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		JsonapiView.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\View\Countries;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Subformpower Json View class for the Countries
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}
diff --git a/api/src/View/Countries/index.html b/api/src/View/Countries/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/View/Countries/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/View/Country/JsonapiView.php b/api/src/View/Country/JsonapiView.php
new file mode 100644
index 0000000..acf2038
--- /dev/null
+++ b/api/src/View/Country/JsonapiView.php
@@ -0,0 +1,36 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		JsonapiView.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\View\Country;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Country Json View class
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}
diff --git a/api/src/View/Country/index.html b/api/src/View/Country/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/View/Country/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/View/Currencies/JsonapiView.php b/api/src/View/Currencies/JsonapiView.php
new file mode 100644
index 0000000..43fe12b
--- /dev/null
+++ b/api/src/View/Currencies/JsonapiView.php
@@ -0,0 +1,36 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		JsonapiView.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\View\Currencies;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Subformpower Json View class for the Currencies
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}
diff --git a/api/src/View/Currencies/index.html b/api/src/View/Currencies/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/View/Currencies/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/View/Currency/JsonapiView.php b/api/src/View/Currency/JsonapiView.php
new file mode 100644
index 0000000..693fd66
--- /dev/null
+++ b/api/src/View/Currency/JsonapiView.php
@@ -0,0 +1,36 @@
+<?php
+/*----------------------------------------------------------------------------------|  www.vdm.io  |----/
+				Nampharm 
+/-------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.1
+	@build			21st August, 2024
+	@created		24th May, 2024
+	@package		Subform Power
+	@subpackage		JsonapiView.php
+	@author			Oh Martin <https://nampharm.com.na>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+  ____  _____  _____  __  __  __      __       ___  _____  __  __  ____  _____  _  _  ____  _  _  ____ 
+ (_  _)(  _  )(  _  )(  \/  )(  )    /__\     / __)(  _  )(  \/  )(  _ \(  _  )( \( )( ___)( \( )(_  _)
+.-_)(   )(_)(  )(_)(  )    (  )(__  /(__)\   ( (__  )(_)(  )    (  )___/ )(_)(  )  (  )__)  )  (   )(  
+\____) (_____)(_____)(_/\/\_)(____)(__)(__)   \___)(_____)(_/\/\_)(__)  (_____)(_)\_)(____)(_)\_) (__) 
+
+/------------------------------------------------------------------------------------------------------*/
+namespace JCB\Component\Subformpower\Api\View\Currency;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper;
+
+// No direct access to this file
+\defined('_JEXEC') or die;
+
+/**
+ * Currency Json View class
+ *
+ * @since  4.0.0
+ */
+class JsonapiView extends BaseApiView
+{
+}
diff --git a/api/src/View/Currency/index.html b/api/src/View/Currency/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/View/Currency/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/View/index.html b/api/src/View/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/View/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/api/src/index.html b/api/src/index.html
new file mode 100644
index 0000000..fa6d84e
--- /dev/null
+++ b/api/src/index.html
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No newline at end of file
diff --git a/libraries/jcb_powers/JCB.Joomla/src/Model/Load.php b/libraries/jcb_powers/JCB.Joomla/src/Model/Load.php
index d56fdbc..5dd9277 100644
--- a/libraries/jcb_powers/JCB.Joomla/src/Model/Load.php
+++ b/libraries/jcb_powers/JCB.Joomla/src/Model/Load.php
@@ -45,8 +45,8 @@ final class Load extends Model implements ModelInterface
 			$table = $this->getTable();
 		}
 
-		// check if this is a valid table
-		if (($store = $this->table->get($table, $field, 'store')) !== null)
+		// check if this is a valid table (don't touch null)
+		if ($value !== null && ($store = $this->table->get($table, $field, 'store')) !== null)
 		{
 			// open the value based on the store method
 			switch($store)
diff --git a/media/js/country.js b/media/js/country.js
index acaffda..2dc761b 100644
--- a/media/js/country.js
+++ b/media/js/country.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		country.js
diff --git a/media/js/currency.js b/media/js/currency.js
index dcfe6a5..4042af2 100644
--- a/media/js/currency.js
+++ b/media/js/currency.js
@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.1
-	@build			20th August, 2024
+	@build			21st August, 2024
 	@created		24th May, 2024
 	@package		Subform Power
 	@subpackage		currency.js
diff --git a/subformpower.xml b/subformpower.xml
index e1a4b35..c34c838 100644
--- a/subformpower.xml
+++ b/subformpower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="5.0" method="upgrade">
 	<name>COM_SUBFORMPOWER</name>
-	<creationDate>20th August, 2024</creationDate>
+	<creationDate>21st August, 2024</creationDate>
 	<author>Oh Martin</author>
 	<authorEmail>oh@nampharm.com.na</authorEmail>
 	<authorUrl>https://nampharm.com.na</authorUrl>