diff --git a/README.md b/README.md
index 2e30bee..cdd7bd9 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ This repository contains an index (see below) of all the approved powers within
   - **final class Update** | [Details](src/cce56585-58b0-4f72-a92c-e2635ea52d83) | [Code](src/cce56585-58b0-4f72-a92c-e2635ea52d83/code.php) | [Settings](src/cce56585-58b0-4f72-a92c-e2635ea52d83/settings.json) | Super__cce56585_58b0_4f72_a92c_e2635ea52d83__Power
 - **Namespace**: [VDM\Joomla\Componentbuilder\Interfaces](#vdm-joomla-componentbuilder-interfaces)
 
+  - **interface FactoryInterface** | [Details](src/caf33c5d-858c-4f9a-894f-ab302ec5445a) | [Code](src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.php) | [Settings](src/caf33c5d-858c-4f9a-894f-ab302ec5445a/settings.json) | Super__caf33c5d_858c_4f9a_894f_ab302ec5445a__Power
   - **interface InsertInterface** | [Details](src/ad12ca1c-d3ce-4e7f-88c5-c6c92bdedc48) | [Code](src/ad12ca1c-d3ce-4e7f-88c5-c6c92bdedc48/code.php) | [Settings](src/ad12ca1c-d3ce-4e7f-88c5-c6c92bdedc48/settings.json) | Super__ad12ca1c_d3ce_4e7f_88c5_c6c92bdedc48__Power
   - **interface ModelInterface** | [Details](src/8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff) | [Code](src/8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff/code.php) | [Settings](src/8aef58c1-3f70-4bd4-b9e4-3f29fcd41cff/settings.json) | Super__8aef58c1_3f70_4bd4_b9e4_3f29fcd41cff__Power
   - **interface UpdateInterface** | [Details](src/7179fde6-1e51-4b51-8545-7ca18f74a0f4) | [Code](src/7179fde6-1e51-4b51-8545-7ca18f74a0f4/code.php) | [Settings](src/7179fde6-1e51-4b51-8545-7ca18f74a0f4/settings.json) | Super__7179fde6_1e51_4b51_8545_7ca18f74a0f4__Power
@@ -355,6 +356,11 @@ namespace VDM\Joomla\Componentbuilder\Database #Olive {
 namespace VDM\Joomla\Componentbuilder\Interfaces #Olive {
 
 
+  interface FactoryInterface  #Lavender {
+    + {static} _() : Mixed
+    + {static} getContainer() : Container
+  }
+
   interface InsertInterface  #Lavender {
     + defaults() : void
     + rows() : bool
diff --git a/src/bfd1d6d5-56c1-4fe9-9fee-1c5910e1f5d8/code.php b/src/bfd1d6d5-56c1-4fe9-9fee-1c5910e1f5d8/code.php
index f19f1fb..6ae6bdd 100644
--- a/src/bfd1d6d5-56c1-4fe9-9fee-1c5910e1f5d8/code.php
+++ b/src/bfd1d6d5-56c1-4fe9-9fee-1c5910e1f5d8/code.php
@@ -48,33 +48,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'mvc_versiondate' => [
-				'name' => 'mvc_versiondate',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MVC_VERSIONDATE_LABEL',
-				'type' => 'list',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
-			'remove_line_breaks' => [
-				'name' => 'remove_line_breaks',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
-			'add_placeholders' => [
-				'name' => 'add_placeholders',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PLACEHOLDERS_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
 			'short_description' => [
 				'name' => 'short_description',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHORT_DESCRIPTION_LABEL',
@@ -84,15 +57,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'description' => [
-				'name' => 'description',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_LABEL',
-				'type' => 'textarea',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
 			'companyname' => [
 				'name' => 'companyname',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL',
@@ -102,18 +66,9 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'php_admin_event' => [
-				'name' => 'php_admin_event',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => 'base64',
-				'tab_name' => 'Libs & Helpers',
-			],
-			'php_site_event' => [
-				'name' => 'php_site_event',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL',
+			'php_helper_both' => [
+				'name' => 'php_helper_both',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'joomla_components',
@@ -129,15 +84,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'publishing',
 			],
-			'php_helper_both' => [
-				'name' => 'php_helper_both',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_BOTH_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'joomla_components',
-				'store' => 'base64',
-				'tab_name' => 'Libs & Helpers',
-			],
 			'crowdin_project_identifier' => [
 				'name' => 'crowdin_project_identifier',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CROWDIN_PROJECT_IDENTIFIER_LABEL',
@@ -174,6 +120,60 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Libs & Helpers',
 			],
+			'mvc_versiondate' => [
+				'name' => 'mvc_versiondate',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MVC_VERSIONDATE_LABEL',
+				'type' => 'list',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'remove_line_breaks' => [
+				'name' => 'remove_line_breaks',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_REMOVE_LINE_BREAKS_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'add_placeholders' => [
+				'name' => 'add_placeholders',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PLACEHOLDERS_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'php_admin_event' => [
+				'name' => 'php_admin_event',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => 'base64',
+				'tab_name' => 'Libs & Helpers',
+			],
+			'php_site_event' => [
+				'name' => 'php_site_event',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => 'base64',
+				'tab_name' => 'Libs & Helpers',
+			],
+			'description' => [
+				'name' => 'description',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_LABEL',
+				'type' => 'textarea',
+				'title' => false,
+				'list' => 'joomla_components',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
 			'author' => [
 				'name' => 'author',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL',
@@ -824,33 +824,6 @@ class Table implements Tableinterface
 			],
 		],
 		'joomla_module' => [
-			'default' => [
-				'name' => 'default',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => 'base64',
-				'tab_name' => 'HTML',
-			],
-			'snippet' => [
-				'name' => 'snippet',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SNIPPET_LABEL',
-				'type' => 'snippets',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'HTML',
-			],
-			'libraries' => [
-				'name' => 'libraries',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_LIBRARIES_LABEL',
-				'type' => 'libraries',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => 'json',
-				'tab_name' => 'HTML',
-			],
 			'system_name' => [
 				'name' => 'system_name',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SYSTEM_NAME_LABEL',
@@ -860,15 +833,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'HTML',
 			],
-			'module_version' => [
-				'name' => 'module_version',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'HTML',
-			],
 			'target' => [
 				'name' => 'target',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_TARGET_LABEL',
@@ -887,51 +851,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'HTML',
 			],
-			'update_server_target' => [
-				'name' => 'update_server_target',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'Dynamic Integration',
-			],
-			'add_update_server' => [
-				'name' => 'add_update_server',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'Dynamic Integration',
-			],
-			'addreadme' => [
-				'name' => 'addreadme',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'Readme',
-			],
-			'add_sql_uninstall' => [
-				'name' => 'add_sql_uninstall',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_UNINSTALL_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'MySQL',
-			],
-			'add_sql' => [
-				'name' => 'add_sql',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'joomla_modules',
-				'store' => NULL,
-				'tab_name' => 'MySQL',
-			],
 			'add_php_method_uninstall' => [
 				'name' => 'add_php_method_uninstall',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_PHP_METHOD_UNINSTALL_LABEL',
@@ -968,6 +887,60 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Script File',
 			],
+			'addreadme' => [
+				'name' => 'addreadme',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADDREADME_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'Readme',
+			],
+			'default' => [
+				'name' => 'default',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_DEFAULT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => 'base64',
+				'tab_name' => 'HTML',
+			],
+			'snippet' => [
+				'name' => 'snippet',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SNIPPET_LABEL',
+				'type' => 'snippets',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'HTML',
+			],
+			'add_sql' => [
+				'name' => 'add_sql',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'MySQL',
+			],
+			'update_server_target' => [
+				'name' => 'update_server_target',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_TARGET_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'Dynamic Integration',
+			],
+			'add_sql_uninstall' => [
+				'name' => 'add_sql_uninstall',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_SQL_UNINSTALL_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'MySQL',
+			],
 			'update_server' => [
 				'name' => 'update_server',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_UPDATE_SERVER_LABEL',
@@ -977,6 +950,33 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Dynamic Integration',
 			],
+			'add_update_server' => [
+				'name' => 'add_update_server',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ADD_UPDATE_SERVER_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'Dynamic Integration',
+			],
+			'libraries' => [
+				'name' => 'libraries',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_LIBRARIES_LABEL',
+				'type' => 'libraries',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => 'json',
+				'tab_name' => 'HTML',
+			],
+			'module_version' => [
+				'name' => 'module_version',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_MODULE_VERSION_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'joomla_modules',
+				'store' => NULL,
+				'tab_name' => 'HTML',
+			],
 			'sales_server' => [
 				'name' => 'sales_server',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SALES_SERVER_LABEL',
@@ -1204,6 +1204,15 @@ class Table implements Tableinterface
 			],
 		],
 		'joomla_plugin' => [
+			'system_name' => [
+				'name' => 'system_name',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_LABEL',
+				'type' => 'text',
+				'title' => true,
+				'list' => 'joomla_plugins',
+				'store' => NULL,
+				'tab_name' => 'Code',
+			],
 			'class_extends' => [
 				'name' => 'class_extends',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL',
@@ -1312,15 +1321,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'MySQL',
 			],
-			'head' => [
-				'name' => 'head',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'joomla_plugins',
-				'store' => 'base64',
-				'tab_name' => 'Code',
-			],
 			'addreadme' => [
 				'name' => 'addreadme',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_ADDREADME_LABEL',
@@ -1330,9 +1330,9 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Readme',
 			],
-			'main_class_code' => [
-				'name' => 'main_class_code',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_MAIN_CLASS_CODE_LABEL',
+			'head' => [
+				'name' => 'head',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_HEAD_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'joomla_plugins',
@@ -1348,6 +1348,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Dynamic Integration',
 			],
+			'main_class_code' => [
+				'name' => 'main_class_code',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_MAIN_CLASS_CODE_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'joomla_plugins',
+				'store' => 'base64',
+				'tab_name' => 'Code',
+			],
 			'update_server' => [
 				'name' => 'update_server',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_UPDATE_SERVER_LABEL',
@@ -1366,15 +1375,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Code',
 			],
-			'system_name' => [
-				'name' => 'system_name',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_SYSTEM_NAME_LABEL',
-				'type' => 'text',
-				'title' => true,
-				'list' => 'joomla_plugins',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
 			'php_postflight_install' => [
 				'name' => 'php_postflight_install',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_PHP_POSTFLIGHT_INSTALL_LABEL',
@@ -1557,13 +1557,22 @@ class Table implements Tableinterface
 			],
 		],
 		'power' => [
-			'method_selection' => [
-				'name' => 'method_selection',
-				'label' => 'COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_LABEL',
-				'type' => 'subform',
+			'system_name' => [
+				'name' => 'system_name',
+				'label' => 'COM_COMPONENTBUILDER_POWER_SYSTEM_NAME_LABEL',
+				'type' => 'text',
+				'title' => true,
+				'list' => 'powers',
+				'store' => NULL,
+				'tab_name' => 'Code',
+			],
+			'namespace' => [
+				'name' => 'namespace',
+				'label' => 'COM_COMPONENTBUILDER_POWER_NAMESPACE_LABEL',
+				'type' => 'text',
 				'title' => false,
 				'list' => 'powers',
-				'store' => 'json',
+				'store' => NULL,
 				'tab_name' => 'Code',
 			],
 			'type' => [
@@ -1575,15 +1584,78 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Code',
 			],
-			'add_head' => [
-				'name' => 'add_head',
-				'label' => 'COM_COMPONENTBUILDER_POWER_ADD_HEAD_LABEL',
-				'type' => 'radio',
+			'power_version' => [
+				'name' => 'power_version',
+				'label' => 'COM_COMPONENTBUILDER_POWER_POWER_VERSION_LABEL',
+				'type' => 'text',
 				'title' => false,
 				'list' => 'powers',
 				'store' => NULL,
 				'tab_name' => 'Code',
 			],
+			'method_selection' => [
+				'name' => 'method_selection',
+				'label' => 'COM_COMPONENTBUILDER_POWER_METHOD_SELECTION_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'powers',
+				'store' => 'json',
+				'tab_name' => 'Code',
+			],
+			'load_selection' => [
+				'name' => 'load_selection',
+				'label' => 'COM_COMPONENTBUILDER_POWER_LOAD_SELECTION_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'powers',
+				'store' => 'json',
+				'tab_name' => 'Code',
+			],
+			'licensing_template' => [
+				'name' => 'licensing_template',
+				'label' => 'COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_LABEL',
+				'type' => 'textarea',
+				'title' => false,
+				'list' => 'powers',
+				'store' => 'base64',
+				'tab_name' => 'Licensing',
+			],
+			'description' => [
+				'name' => 'description',
+				'label' => 'COM_COMPONENTBUILDER_POWER_DESCRIPTION_LABEL',
+				'type' => 'textarea',
+				'title' => false,
+				'list' => 'powers',
+				'store' => NULL,
+				'tab_name' => 'Code',
+			],
+			'composer' => [
+				'name' => 'composer',
+				'label' => 'COM_COMPONENTBUILDER_POWER_COMPOSER_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'powers',
+				'store' => 'json',
+				'tab_name' => 'Composer',
+			],
+			'extends' => [
+				'name' => 'extends',
+				'label' => 'COM_COMPONENTBUILDER_POWER_EXTENDS_LABEL',
+				'type' => 'classpowers',
+				'title' => false,
+				'list' => 'powers',
+				'store' => NULL,
+				'tab_name' => 'Code',
+			],
+			'approved' => [
+				'name' => 'approved',
+				'label' => 'COM_COMPONENTBUILDER_POWER_APPROVED_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'powers',
+				'store' => NULL,
+				'tab_name' => 'Super Power',
+			],
 			'property_selection' => [
 				'name' => 'property_selection',
 				'label' => 'COM_COMPONENTBUILDER_POWER_PROPERTY_SELECTION_LABEL',
@@ -1593,18 +1665,27 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Code',
 			],
-			'implements_custom' => [
-				'name' => 'implements_custom',
-				'label' => 'COM_COMPONENTBUILDER_POWER_IMPLEMENTS_CUSTOM_LABEL',
+			'add_head' => [
+				'name' => 'add_head',
+				'label' => 'COM_COMPONENTBUILDER_POWER_ADD_HEAD_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'powers',
+				'store' => NULL,
+				'tab_name' => 'Code',
+			],
+			'extends_custom' => [
+				'name' => 'extends_custom',
+				'label' => 'COM_COMPONENTBUILDER_POWER_EXTENDS_CUSTOM_LABEL',
 				'type' => 'text',
 				'title' => false,
 				'list' => 'powers',
 				'store' => NULL,
 				'tab_name' => 'Code',
 			],
-			'namespace' => [
-				'name' => 'namespace',
-				'label' => 'COM_COMPONENTBUILDER_POWER_NAMESPACE_LABEL',
+			'implements_custom' => [
+				'name' => 'implements_custom',
+				'label' => 'COM_COMPONENTBUILDER_POWER_IMPLEMENTS_CUSTOM_LABEL',
 				'type' => 'text',
 				'title' => false,
 				'list' => 'powers',
@@ -1620,51 +1701,6 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Code',
 			],
-			'extends_custom' => [
-				'name' => 'extends_custom',
-				'label' => 'COM_COMPONENTBUILDER_POWER_EXTENDS_CUSTOM_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
-			'extends' => [
-				'name' => 'extends',
-				'label' => 'COM_COMPONENTBUILDER_POWER_EXTENDS_LABEL',
-				'type' => 'classpowers',
-				'title' => false,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
-			'system_name' => [
-				'name' => 'system_name',
-				'label' => 'COM_COMPONENTBUILDER_POWER_SYSTEM_NAME_LABEL',
-				'type' => 'text',
-				'title' => true,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
-			'power_version' => [
-				'name' => 'power_version',
-				'label' => 'COM_COMPONENTBUILDER_POWER_POWER_VERSION_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
-			'approved' => [
-				'name' => 'approved',
-				'label' => 'COM_COMPONENTBUILDER_POWER_APPROVED_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Super Power',
-			],
 			'head' => [
 				'name' => 'head',
 				'label' => 'COM_COMPONENTBUILDER_POWER_HEAD_LABEL',
@@ -1674,42 +1710,6 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Code',
 			],
-			'load_selection' => [
-				'name' => 'load_selection',
-				'label' => 'COM_COMPONENTBUILDER_POWER_LOAD_SELECTION_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'powers',
-				'store' => 'json',
-				'tab_name' => 'Code',
-			],
-			'description' => [
-				'name' => 'description',
-				'label' => 'COM_COMPONENTBUILDER_POWER_DESCRIPTION_LABEL',
-				'type' => 'textarea',
-				'title' => false,
-				'list' => 'powers',
-				'store' => NULL,
-				'tab_name' => 'Code',
-			],
-			'licensing_template' => [
-				'name' => 'licensing_template',
-				'label' => 'COM_COMPONENTBUILDER_POWER_LICENSING_TEMPLATE_LABEL',
-				'type' => 'textarea',
-				'title' => false,
-				'list' => 'powers',
-				'store' => 'base64',
-				'tab_name' => 'Licensing',
-			],
-			'composer' => [
-				'name' => 'composer',
-				'label' => 'COM_COMPONENTBUILDER_POWER_COMPOSER_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'powers',
-				'store' => 'json',
-				'tab_name' => 'Composer',
-			],
 			'approved_paths' => [
 				'name' => 'approved_paths',
 				'label' => 'COM_COMPONENTBUILDER_POWER_APPROVED_PATHS_LABEL',
@@ -1784,6 +1784,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
+			'short_description' => [
+				'name' => 'short_description',
+				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'admin_views',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
 			'php_allowedit' => [
 				'name' => 'php_allowedit',
 				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL',
@@ -1793,15 +1802,6 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'PHP',
 			],
-			'php_before_save' => [
-				'name' => 'php_before_save',
-				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'admin_views',
-				'store' => 'base64',
-				'tab_name' => 'PHP',
-			],
 			'php_postsavehook' => [
 				'name' => 'php_postsavehook',
 				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_LABEL',
@@ -1811,14 +1811,14 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'PHP',
 			],
-			'php_import_ext' => [
-				'name' => 'php_import_ext',
-				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL',
-				'type' => 'textarea',
+			'php_before_save' => [
+				'name' => 'php_before_save',
+				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL',
+				'type' => 'editor',
 				'title' => false,
 				'list' => 'admin_views',
 				'store' => 'base64',
-				'tab_name' => 'Custom Import',
+				'tab_name' => 'PHP',
 			],
 			'php_getlistquery' => [
 				'name' => 'php_getlistquery',
@@ -1829,6 +1829,15 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'PHP',
 			],
+			'php_import_ext' => [
+				'name' => 'php_import_ext',
+				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL',
+				'type' => 'textarea',
+				'title' => false,
+				'list' => 'admin_views',
+				'store' => 'base64',
+				'tab_name' => 'Custom Import',
+			],
 			'icon' => [
 				'name' => 'icon',
 				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL',
@@ -1838,15 +1847,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'short_description' => [
-				'name' => 'short_description',
-				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'admin_views',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
 			'php_after_publish' => [
 				'name' => 'php_after_publish',
 				'label' => 'COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL',
@@ -2623,9 +2623,63 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'context' => [
-				'name' => 'context',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL',
+			'main_get' => [
+				'name' => 'main_get',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL',
+				'type' => 'maingets',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'add_php_jview_display' => [
+				'name' => 'add_php_jview_display',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => NULL,
+				'tab_name' => 'PHP',
+			],
+			'css_document' => [
+				'name' => 'css_document',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'css' => [
+				'name' => 'css',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'js_document' => [
+				'name' => 'js_document',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'javascript_file' => [
+				'name' => 'javascript_file',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'codename' => [
+				'name' => 'codename',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL',
 				'type' => 'text',
 				'title' => false,
 				'list' => 'custom_admin_views',
@@ -2659,15 +2713,33 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'libraries' => [
-				'name' => 'libraries',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL',
-				'type' => 'libraries',
+			'add_php_jview' => [
+				'name' => 'add_php_jview',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL',
+				'type' => 'radio',
 				'title' => false,
 				'list' => 'custom_admin_views',
-				'store' => 'json',
+				'store' => NULL,
+				'tab_name' => 'PHP',
+			],
+			'context' => [
+				'name' => 'context',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTEXT_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => NULL,
 				'tab_name' => 'Details',
 			],
+			'add_js_document' => [
+				'name' => 'add_js_document',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => NULL,
+				'tab_name' => 'JavaScript & CSS',
+			],
 			'custom_get' => [
 				'name' => 'custom_get',
 				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL',
@@ -2677,18 +2749,36 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Details',
 			],
-			'main_get' => [
-				'name' => 'main_get',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL',
-				'type' => 'maingets',
+			'add_javascript_file' => [
+				'name' => 'add_javascript_file',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL',
+				'type' => 'radio',
 				'title' => false,
 				'list' => 'custom_admin_views',
 				'store' => NULL,
-				'tab_name' => 'Details',
+				'tab_name' => 'JavaScript & CSS',
 			],
-			'add_php_ajax' => [
-				'name' => 'add_php_ajax',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL',
+			'php_ajaxmethod' => [
+				'name' => 'php_ajaxmethod',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => 'base64',
+				'tab_name' => 'PHP',
+			],
+			'add_css_document' => [
+				'name' => 'add_css_document',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'custom_admin_views',
+				'store' => NULL,
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'add_php_document' => [
+				'name' => 'add_php_document',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL',
 				'type' => 'radio',
 				'title' => false,
 				'list' => 'custom_admin_views',
@@ -2704,96 +2794,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'JavaScript & CSS',
 			],
-			'css' => [
-				'name' => 'css',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => 'base64',
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'add_css_document' => [
-				'name' => 'add_css_document',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'css_document' => [
-				'name' => 'css_document',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => 'base64',
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'add_javascript_file' => [
-				'name' => 'add_javascript_file',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'javascript_file' => [
-				'name' => 'javascript_file',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => 'base64',
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'add_js_document' => [
-				'name' => 'add_js_document',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'js_document' => [
-				'name' => 'js_document',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => 'base64',
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'codename' => [
-				'name' => 'codename',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
-			'add_php_jview' => [
-				'name' => 'add_php_jview',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'PHP',
-			],
-			'add_php_jview_display' => [
-				'name' => 'add_php_jview_display',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'custom_admin_views',
-				'store' => NULL,
-				'tab_name' => 'PHP',
-			],
 			'add_php_view' => [
 				'name' => 'add_php_view',
 				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL',
@@ -2803,23 +2803,23 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'PHP',
 			],
-			'add_php_document' => [
-				'name' => 'add_php_document',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL',
+			'add_php_ajax' => [
+				'name' => 'add_php_ajax',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL',
 				'type' => 'radio',
 				'title' => false,
 				'list' => 'custom_admin_views',
 				'store' => NULL,
 				'tab_name' => 'PHP',
 			],
-			'php_ajaxmethod' => [
-				'name' => 'php_ajaxmethod',
-				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL',
-				'type' => 'editor',
+			'libraries' => [
+				'name' => 'libraries',
+				'label' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL',
+				'type' => 'libraries',
 				'title' => false,
 				'list' => 'custom_admin_views',
-				'store' => 'base64',
-				'tab_name' => 'PHP',
+				'store' => 'json',
+				'tab_name' => 'Details',
 			],
 			'ajax_input' => [
 				'name' => 'ajax_input',
@@ -2949,6 +2949,69 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
+			'main_get' => [
+				'name' => 'main_get',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL',
+				'type' => 'maingets',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'add_php_jview_display' => [
+				'name' => 'add_php_jview_display',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => NULL,
+				'tab_name' => 'PHP',
+			],
+			'add_php_document' => [
+				'name' => 'add_php_document',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => NULL,
+				'tab_name' => 'PHP',
+			],
+			'add_php_view' => [
+				'name' => 'add_php_view',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => NULL,
+				'tab_name' => 'PHP',
+			],
+			'js_document' => [
+				'name' => 'js_document',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
+			'codename' => [
+				'name' => 'codename',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
+			'javascript_file' => [
+				'name' => 'javascript_file',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'site_views',
+				'store' => 'base64',
+				'tab_name' => 'JavaScript & CSS',
+			],
 			'context' => [
 				'name' => 'context',
 				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CONTEXT_LABEL',
@@ -2976,14 +3039,14 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'libraries' => [
-				'name' => 'libraries',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL',
-				'type' => 'libraries',
+			'add_php_jview' => [
+				'name' => 'add_php_jview',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL',
+				'type' => 'radio',
 				'title' => false,
 				'list' => 'site_views',
-				'store' => 'json',
-				'tab_name' => 'Details',
+				'store' => NULL,
+				'tab_name' => 'PHP',
 			],
 			'custom_get' => [
 				'name' => 'custom_get',
@@ -2994,36 +3057,9 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Details',
 			],
-			'main_get' => [
-				'name' => 'main_get',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL',
-				'type' => 'maingets',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
-			'add_css_document' => [
-				'name' => 'add_css_document',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'add_js_document' => [
-				'name' => 'add_js_document',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'JavaScript & CSS',
-			],
-			'js_document' => [
-				'name' => 'js_document',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL',
+			'css_document' => [
+				'name' => 'css_document',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'site_views',
@@ -3039,59 +3075,23 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'JavaScript & CSS',
 			],
-			'javascript_file' => [
-				'name' => 'javascript_file',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL',
+			'css' => [
+				'name' => 'css',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'site_views',
 				'store' => 'base64',
 				'tab_name' => 'JavaScript & CSS',
 			],
-			'codename' => [
-				'name' => 'codename',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
-			'add_php_jview_display' => [
-				'name' => 'add_php_jview_display',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL',
+			'add_js_document' => [
+				'name' => 'add_js_document',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL',
 				'type' => 'radio',
 				'title' => false,
 				'list' => 'site_views',
 				'store' => NULL,
-				'tab_name' => 'PHP',
-			],
-			'add_php_jview' => [
-				'name' => 'add_php_jview',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'PHP',
-			],
-			'add_php_view' => [
-				'name' => 'add_php_view',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'PHP',
-			],
-			'add_php_document' => [
-				'name' => 'add_php_document',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'site_views',
-				'store' => NULL,
-				'tab_name' => 'PHP',
+				'tab_name' => 'JavaScript & CSS',
 			],
 			'php_ajaxmethod' => [
 				'name' => 'php_ajaxmethod',
@@ -3102,23 +3102,23 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'PHP',
 			],
-			'css' => [
-				'name' => 'css',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL',
-				'type' => 'editor',
+			'add_css_document' => [
+				'name' => 'add_css_document',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL',
+				'type' => 'radio',
 				'title' => false,
 				'list' => 'site_views',
-				'store' => 'base64',
+				'store' => NULL,
 				'tab_name' => 'JavaScript & CSS',
 			],
-			'css_document' => [
-				'name' => 'css_document',
-				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL',
-				'type' => 'editor',
+			'libraries' => [
+				'name' => 'libraries',
+				'label' => 'COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL',
+				'type' => 'libraries',
 				'title' => false,
 				'list' => 'site_views',
-				'store' => 'base64',
-				'tab_name' => 'JavaScript & CSS',
+				'store' => 'json',
+				'tab_name' => 'Details',
 			],
 			'add_css' => [
 				'name' => 'add_css',
@@ -3432,14 +3432,14 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Main',
 			],
-			'php_after_getitems' => [
-				'name' => 'php_after_getitems',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_LABEL',
-				'type' => 'editor',
+			'gettype' => [
+				'name' => 'gettype',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL',
+				'type' => 'list',
 				'title' => false,
 				'list' => 'dynamic_gets',
-				'store' => 'base64',
-				'tab_name' => 'Custom Script',
+				'store' => NULL,
+				'tab_name' => 'Main',
 			],
 			'php_router_parse' => [
 				'name' => 'php_router_parse',
@@ -3450,15 +3450,6 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Custom Script',
 			],
-			'php_getlistquery' => [
-				'name' => 'php_getlistquery',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'dynamic_gets',
-				'store' => 'base64',
-				'tab_name' => 'Custom Script',
-			],
 			'php_before_getitems' => [
 				'name' => 'php_before_getitems',
 				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEMS_LABEL',
@@ -3468,9 +3459,9 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Custom Script',
 			],
-			'php_before_getitem' => [
-				'name' => 'php_before_getitem',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_LABEL',
+			'php_after_getitems' => [
+				'name' => 'php_after_getitems',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_AFTER_GETITEMS_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'dynamic_gets',
@@ -3486,14 +3477,14 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Custom Script',
 			],
-			'php_calculation' => [
-				'name' => 'php_calculation',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL',
+			'php_getlistquery' => [
+				'name' => 'php_getlistquery',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_GETLISTQUERY_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'dynamic_gets',
 				'store' => 'base64',
-				'tab_name' => 'Abacus',
+				'tab_name' => 'Custom Script',
 			],
 			'join_db_table' => [
 				'name' => 'join_db_table',
@@ -3504,6 +3495,24 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Joint',
 			],
+			'view_selection' => [
+				'name' => 'view_selection',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL',
+				'type' => 'textarea',
+				'title' => false,
+				'list' => 'dynamic_gets',
+				'store' => NULL,
+				'tab_name' => 'Main',
+			],
+			'db_table_main' => [
+				'name' => 'db_table_main',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_LABEL',
+				'type' => 'dbtables',
+				'title' => false,
+				'list' => 'dynamic_gets',
+				'store' => NULL,
+				'tab_name' => 'Main',
+			],
 			'php_custom_get' => [
 				'name' => 'php_custom_get',
 				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CUSTOM_GET_LABEL',
@@ -3531,32 +3540,23 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Main',
 			],
-			'view_selection' => [
-				'name' => 'view_selection',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_SELECTION_LABEL',
-				'type' => 'textarea',
+			'php_calculation' => [
+				'name' => 'php_calculation',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_CALCULATION_LABEL',
+				'type' => 'editor',
 				'title' => false,
 				'list' => 'dynamic_gets',
-				'store' => NULL,
-				'tab_name' => 'Main',
+				'store' => 'base64',
+				'tab_name' => 'Abacus',
 			],
-			'select_all' => [
-				'name' => 'select_all',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_SELECT_ALL_LABEL',
-				'type' => 'radio',
+			'php_before_getitem' => [
+				'name' => 'php_before_getitem',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_PHP_BEFORE_GETITEM_LABEL',
+				'type' => 'editor',
 				'title' => false,
 				'list' => 'dynamic_gets',
-				'store' => NULL,
-				'tab_name' => 'Main',
-			],
-			'db_table_main' => [
-				'name' => 'db_table_main',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_MAIN_LABEL',
-				'type' => 'dbtables',
-				'title' => false,
-				'list' => 'dynamic_gets',
-				'store' => NULL,
-				'tab_name' => 'Main',
+				'store' => 'base64',
+				'tab_name' => 'Custom Script',
 			],
 			'view_table_main' => [
 				'name' => 'view_table_main',
@@ -3567,10 +3567,10 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Main',
 			],
-			'gettype' => [
-				'name' => 'gettype',
-				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL',
-				'type' => 'list',
+			'select_all' => [
+				'name' => 'select_all',
+				'label' => 'COM_COMPONENTBUILDER_DYNAMIC_GET_SELECT_ALL_LABEL',
+				'type' => 'radio',
 				'title' => false,
 				'list' => 'dynamic_gets',
 				'store' => NULL,
@@ -3991,15 +3991,6 @@ class Table implements Tableinterface
 			],
 		],
 		'library' => [
-			'addconditions' => [
-				'name' => 'addconditions',
-				'label' => 'COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'libraries',
-				'store' => 'json',
-				'tab_name' => 'Behaviour',
-			],
 			'name' => [
 				'name' => 'name',
 				'label' => 'COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL',
@@ -4009,15 +4000,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Behaviour',
 			],
-			'php_setdocument' => [
-				'name' => 'php_setdocument',
-				'label' => 'COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL',
-				'type' => 'textarea',
-				'title' => false,
-				'list' => 'libraries',
-				'store' => 'base64',
-				'tab_name' => 'Behaviour',
-			],
 			'target' => [
 				'name' => 'target',
 				'label' => 'COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL',
@@ -4045,6 +4027,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Behaviour',
 			],
+			'description' => [
+				'name' => 'description',
+				'label' => 'COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'libraries',
+				'store' => NULL,
+				'tab_name' => 'Behaviour',
+			],
 			'libraries' => [
 				'name' => 'libraries',
 				'label' => 'COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL',
@@ -4054,13 +4045,22 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Behaviour',
 			],
-			'description' => [
-				'name' => 'description',
-				'label' => 'COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL',
-				'type' => 'text',
+			'php_setdocument' => [
+				'name' => 'php_setdocument',
+				'label' => 'COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL',
+				'type' => 'textarea',
 				'title' => false,
 				'list' => 'libraries',
-				'store' => NULL,
+				'store' => 'base64',
+				'tab_name' => 'Behaviour',
+			],
+			'addconditions' => [
+				'name' => 'addconditions',
+				'label' => 'COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'libraries',
+				'store' => 'json',
 				'tab_name' => 'Behaviour',
 			],
 			'guid' => [
@@ -4258,33 +4258,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database',
 			],
-			'datadefault' => [
-				'name' => 'datadefault',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL',
-				'type' => 'list',
-				'title' => false,
-				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Database',
-			],
-			'datalenght_other' => [
-				'name' => 'datalenght_other',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Database',
-			],
-			'datalenght' => [
-				'name' => 'datalenght',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL',
-				'type' => 'list',
-				'title' => false,
-				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Database',
-			],
 			'indexes' => [
 				'name' => 'indexes',
 				'label' => 'COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL',
@@ -4294,15 +4267,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database',
 			],
-			'datadefault_other' => [
-				'name' => 'datadefault_other',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL',
-				'type' => 'text',
-				'title' => false,
-				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Database',
-			],
 			'null_switch' => [
 				'name' => 'null_switch',
 				'label' => 'COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL',
@@ -4321,41 +4285,14 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database',
 			],
-			'add_css_views' => [
-				'name' => 'add_css_views',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL',
-				'type' => 'radio',
+			'catid' => [
+				'name' => 'catid',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_CATID_LABEL',
+				'type' => 'category',
 				'title' => false,
 				'list' => 'fields',
 				'store' => NULL,
-				'tab_name' => 'Scripts',
-			],
-			'add_css_view' => [
-				'name' => 'add_css_view',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL',
-				'type' => 'radio',
-				'title' => false,
-				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Scripts',
-			],
-			'css_view' => [
-				'name' => 'css_view',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL',
-				'type' => 'editor',
-				'title' => false,
-				'list' => 'fields',
-				'store' => 'base64',
-				'tab_name' => 'Scripts',
-			],
-			'on_save_model_field' => [
-				'name' => 'on_save_model_field',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL',
-				'type' => 'textarea',
-				'title' => false,
-				'list' => 'fields',
-				'store' => 'base64',
-				'tab_name' => 'Database',
+				'tab_name' => 'Set Properties',
 			],
 			'on_get_model_field' => [
 				'name' => 'on_get_model_field',
@@ -4366,14 +4303,14 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Database',
 			],
-			'catid' => [
-				'name' => 'catid',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_CATID_LABEL',
-				'type' => 'category',
+			'on_save_model_field' => [
+				'name' => 'on_save_model_field',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_ON_SAVE_MODEL_FIELD_LABEL',
+				'type' => 'textarea',
 				'title' => false,
 				'list' => 'fields',
-				'store' => NULL,
-				'tab_name' => 'Set Properties',
+				'store' => 'base64',
+				'tab_name' => 'Database',
 			],
 			'initiator_on_get_model' => [
 				'name' => 'initiator_on_get_model',
@@ -4384,18 +4321,18 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Database',
 			],
-			'xml' => [
-				'name' => 'xml',
-				'label' => '',
-				'type' => 'hidden',
+			'datalenght' => [
+				'name' => 'datalenght',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL',
+				'type' => 'list',
 				'title' => false,
 				'list' => 'fields',
-				'store' => 'json',
-				'tab_name' => 'Type Info',
+				'store' => NULL,
+				'tab_name' => 'Database',
 			],
-			'javascript_views_footer' => [
-				'name' => 'javascript_views_footer',
-				'label' => 'COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL',
+			'css_view' => [
+				'name' => 'css_view',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL',
 				'type' => 'editor',
 				'title' => false,
 				'list' => 'fields',
@@ -4420,6 +4357,69 @@ class Table implements Tableinterface
 				'store' => 'base64',
 				'tab_name' => 'Scripts',
 			],
+			'datadefault_other' => [
+				'name' => 'datadefault_other',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'fields',
+				'store' => NULL,
+				'tab_name' => 'Database',
+			],
+			'datadefault' => [
+				'name' => 'datadefault',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL',
+				'type' => 'list',
+				'title' => false,
+				'list' => 'fields',
+				'store' => NULL,
+				'tab_name' => 'Database',
+			],
+			'datalenght_other' => [
+				'name' => 'datalenght_other',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'fields',
+				'store' => NULL,
+				'tab_name' => 'Database',
+			],
+			'javascript_views_footer' => [
+				'name' => 'javascript_views_footer',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL',
+				'type' => 'editor',
+				'title' => false,
+				'list' => 'fields',
+				'store' => 'base64',
+				'tab_name' => 'Scripts',
+			],
+			'add_css_view' => [
+				'name' => 'add_css_view',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'fields',
+				'store' => NULL,
+				'tab_name' => 'Scripts',
+			],
+			'xml' => [
+				'name' => 'xml',
+				'label' => '',
+				'type' => 'hidden',
+				'title' => false,
+				'list' => 'fields',
+				'store' => 'json',
+				'tab_name' => 'Type Info',
+			],
+			'add_css_views' => [
+				'name' => 'add_css_views',
+				'label' => 'COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL',
+				'type' => 'radio',
+				'title' => false,
+				'list' => 'fields',
+				'store' => NULL,
+				'tab_name' => 'Scripts',
+			],
 			'add_javascript_view_footer' => [
 				'name' => 'add_javascript_view_footer',
 				'label' => 'COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL',
@@ -4458,6 +4458,15 @@ class Table implements Tableinterface
 			],
 		],
 		'fieldtype' => [
+			'name' => [
+				'name' => 'name',
+				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL',
+				'type' => 'text',
+				'title' => true,
+				'list' => 'fieldtypes',
+				'store' => NULL,
+				'tab_name' => 'Details',
+			],
 			'store' => [
 				'name' => 'store',
 				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_STORE_LABEL',
@@ -4467,15 +4476,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database (defaults)',
 			],
-			'indexes' => [
-				'name' => 'indexes',
-				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_INDEXES_LABEL',
-				'type' => 'list',
-				'title' => false,
-				'list' => 'fieldtypes',
-				'store' => NULL,
-				'tab_name' => 'Database (defaults)',
-			],
 			'null_switch' => [
 				'name' => 'null_switch',
 				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_NULL_SWITCH_LABEL',
@@ -4485,9 +4485,9 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database (defaults)',
 			],
-			'datadefault' => [
-				'name' => 'datadefault',
-				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_LABEL',
+			'indexes' => [
+				'name' => 'indexes',
+				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_INDEXES_LABEL',
 				'type' => 'list',
 				'title' => false,
 				'list' => 'fieldtypes',
@@ -4503,6 +4503,24 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database (defaults)',
 			],
+			'datadefault' => [
+				'name' => 'datadefault',
+				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_LABEL',
+				'type' => 'list',
+				'title' => false,
+				'list' => 'fieldtypes',
+				'store' => NULL,
+				'tab_name' => 'Database (defaults)',
+			],
+			'datalenght_other' => [
+				'name' => 'datalenght_other',
+				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL',
+				'type' => 'text',
+				'title' => false,
+				'list' => 'fieldtypes',
+				'store' => NULL,
+				'tab_name' => 'Database (defaults)',
+			],
 			'short_description' => [
 				'name' => 'short_description',
 				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL',
@@ -4512,10 +4530,10 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Details',
 			],
-			'datalenght_other' => [
-				'name' => 'datalenght_other',
-				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL',
-				'type' => 'text',
+			'datatype' => [
+				'name' => 'datatype',
+				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL',
+				'type' => 'list',
 				'title' => false,
 				'list' => 'fieldtypes',
 				'store' => NULL,
@@ -4530,24 +4548,6 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Database (defaults)',
 			],
-			'datatype' => [
-				'name' => 'datatype',
-				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL',
-				'type' => 'list',
-				'title' => false,
-				'list' => 'fieldtypes',
-				'store' => NULL,
-				'tab_name' => 'Database (defaults)',
-			],
-			'name' => [
-				'name' => 'name',
-				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL',
-				'type' => 'text',
-				'title' => true,
-				'list' => 'fieldtypes',
-				'store' => NULL,
-				'tab_name' => 'Details',
-			],
 			'properties' => [
 				'name' => 'properties',
 				'label' => 'COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_LABEL',
@@ -4922,15 +4922,6 @@ class Table implements Tableinterface
 			],
 		],
 		'admin_fields_relations' => [
-			'addrelations' => [
-				'name' => 'addrelations',
-				'label' => 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADDRELATIONS_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'admins_fields_relations',
-				'store' => 'json',
-				'tab_name' => 'Relations',
-			],
 			'admin_view' => [
 				'name' => 'admin_view',
 				'label' => 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADMIN_VIEW_LABEL',
@@ -4940,6 +4931,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Relations',
 			],
+			'addrelations' => [
+				'name' => 'addrelations',
+				'label' => 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADDRELATIONS_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'admins_fields_relations',
+				'store' => 'json',
+				'tab_name' => 'Relations',
+			],
 		],
 		'admin_custom_tabs' => [
 			'admin_view' => [
@@ -4962,15 +4962,6 @@ class Table implements Tableinterface
 			],
 		],
 		'component_admin_views' => [
-			'addadmin_views' => [
-				'name' => 'addadmin_views',
-				'label' => 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'components_admin_views',
-				'store' => 'json',
-				'tab_name' => 'Views',
-			],
 			'joomla_component' => [
 				'name' => 'joomla_component',
 				'label' => 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL',
@@ -4980,17 +4971,17 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Views',
 			],
-		],
-		'component_site_views' => [
-			'addsite_views' => [
-				'name' => 'addsite_views',
-				'label' => 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_LABEL',
+			'addadmin_views' => [
+				'name' => 'addadmin_views',
+				'label' => 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_LABEL',
 				'type' => 'subform',
 				'title' => false,
-				'list' => 'components_site_views',
+				'list' => 'components_admin_views',
 				'store' => 'json',
 				'tab_name' => 'Views',
 			],
+		],
+		'component_site_views' => [
 			'joomla_component' => [
 				'name' => 'joomla_component',
 				'label' => 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL',
@@ -5000,17 +4991,17 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Views',
 			],
-		],
-		'component_custom_admin_views' => [
-			'addcustom_admin_views' => [
-				'name' => 'addcustom_admin_views',
-				'label' => 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS_LABEL',
+			'addsite_views' => [
+				'name' => 'addsite_views',
+				'label' => 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_LABEL',
 				'type' => 'subform',
 				'title' => false,
-				'list' => 'components_custom_admin_views',
+				'list' => 'components_site_views',
 				'store' => 'json',
 				'tab_name' => 'Views',
 			],
+		],
+		'component_custom_admin_views' => [
 			'joomla_component' => [
 				'name' => 'joomla_component',
 				'label' => 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_LABEL',
@@ -5020,6 +5011,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Views',
 			],
+			'addcustom_admin_views' => [
+				'name' => 'addcustom_admin_views',
+				'label' => 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'components_custom_admin_views',
+				'store' => 'json',
+				'tab_name' => 'Views',
+			],
 		],
 		'component_updates' => [
 			'joomla_component' => [
@@ -5198,15 +5198,6 @@ class Table implements Tableinterface
 			],
 		],
 		'component_plugins' => [
-			'addjoomla_plugins' => [
-				'name' => 'addjoomla_plugins',
-				'label' => 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_LABEL',
-				'type' => 'subform',
-				'title' => false,
-				'list' => 'components_plugins',
-				'store' => 'json',
-				'tab_name' => 'Plugins',
-			],
 			'joomla_component' => [
 				'name' => 'joomla_component',
 				'label' => 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_JOOMLA_COMPONENT_LABEL',
@@ -5216,17 +5207,17 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Plugins',
 			],
-		],
-		'component_modules' => [
-			'addjoomla_modules' => [
-				'name' => 'addjoomla_modules',
-				'label' => 'COM_COMPONENTBUILDER_COMPONENT_MODULES_ADDJOOMLA_MODULES_LABEL',
+			'addjoomla_plugins' => [
+				'name' => 'addjoomla_plugins',
+				'label' => 'COM_COMPONENTBUILDER_COMPONENT_PLUGINS_ADDJOOMLA_PLUGINS_LABEL',
 				'type' => 'subform',
 				'title' => false,
-				'list' => 'components_modules',
+				'list' => 'components_plugins',
 				'store' => 'json',
-				'tab_name' => 'Modules',
+				'tab_name' => 'Plugins',
 			],
+		],
+		'component_modules' => [
 			'joomla_component' => [
 				'name' => 'joomla_component',
 				'label' => 'COM_COMPONENTBUILDER_COMPONENT_MODULES_JOOMLA_COMPONENT_LABEL',
@@ -5236,6 +5227,15 @@ class Table implements Tableinterface
 				'store' => NULL,
 				'tab_name' => 'Modules',
 			],
+			'addjoomla_modules' => [
+				'name' => 'addjoomla_modules',
+				'label' => 'COM_COMPONENTBUILDER_COMPONENT_MODULES_ADDJOOMLA_MODULES_LABEL',
+				'type' => 'subform',
+				'title' => false,
+				'list' => 'components_modules',
+				'store' => 'json',
+				'tab_name' => 'Modules',
+			],
 		],
 		'snippet_type' => [
 			'name' => [
@@ -5278,6 +5278,15 @@ class Table implements Tableinterface
 			],
 		],
 		'library_files_folders_urls' => [
+			'library' => [
+				'name' => 'library',
+				'label' => 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_LABEL',
+				'type' => 'libraryreadonly',
+				'title' => true,
+				'list' => 'libraries_files_folders_urls',
+				'store' => NULL,
+				'tab_name' => 'Basic',
+			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
 				'label' => 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_LABEL',
@@ -5305,15 +5314,6 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Basic',
 			],
-			'library' => [
-				'name' => 'library',
-				'label' => 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_LABEL',
-				'type' => 'libraryreadonly',
-				'title' => true,
-				'list' => 'libraries_files_folders_urls',
-				'store' => NULL,
-				'tab_name' => 'Basic',
-			],
 			'addfiles' => [
 				'name' => 'addfiles',
 				'label' => 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_LABEL',
@@ -5392,6 +5392,15 @@ class Table implements Tableinterface
 			],
 		],
 		'joomla_module_files_folders_urls' => [
+			'joomla_module' => [
+				'name' => 'joomla_module',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_JOOMLA_MODULE_LABEL',
+				'type' => 'joomlamodules',
+				'title' => true,
+				'list' => 'joomla_modules_files_folders_urls',
+				'store' => NULL,
+				'tab_name' => 'Basic',
+			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_LABEL',
@@ -5419,15 +5428,6 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Basic',
 			],
-			'joomla_module' => [
-				'name' => 'joomla_module',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_JOOMLA_MODULE_LABEL',
-				'type' => 'joomlamodules',
-				'title' => true,
-				'list' => 'joomla_modules_files_folders_urls',
-				'store' => NULL,
-				'tab_name' => 'Basic',
-			],
 			'addfiles' => [
 				'name' => 'addfiles',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_MODULE_FILES_FOLDERS_URLS_ADDFILES_LABEL',
@@ -5488,6 +5488,15 @@ class Table implements Tableinterface
 			],
 		],
 		'joomla_plugin_files_folders_urls' => [
+			'joomla_plugin' => [
+				'name' => 'joomla_plugin',
+				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_JOOMLA_PLUGIN_LABEL',
+				'type' => 'joomlaplugins',
+				'title' => true,
+				'list' => 'joomla_plugins_files_folders_urls',
+				'store' => NULL,
+				'tab_name' => 'Basic',
+			],
 			'addfoldersfullpath' => [
 				'name' => 'addfoldersfullpath',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_LABEL',
@@ -5515,15 +5524,6 @@ class Table implements Tableinterface
 				'store' => 'json',
 				'tab_name' => 'Basic',
 			],
-			'joomla_plugin' => [
-				'name' => 'joomla_plugin',
-				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_JOOMLA_PLUGIN_LABEL',
-				'type' => 'joomlaplugins',
-				'title' => true,
-				'list' => 'joomla_plugins_files_folders_urls',
-				'store' => NULL,
-				'tab_name' => 'Basic',
-			],
 			'addfiles' => [
 				'name' => 'addfiles',
 				'label' => 'COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FILES_FOLDERS_URLS_ADDFILES_LABEL',
diff --git a/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/README.md b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/README.md
new file mode 100644
index 0000000..eeb3a5f
--- /dev/null
+++ b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/README.md
@@ -0,0 +1,45 @@
+```
+██████╗  ██████╗ ██╗    ██╗███████╗██████╗
+██╔══██╗██╔═══██╗██║    ██║██╔════╝██╔══██╗
+██████╔╝██║   ██║██║ █╗ ██║█████╗  ██████╔╝
+██╔═══╝ ██║   ██║██║███╗██║██╔══╝  ██╔══██╗
+██║     ╚██████╔╝╚███╔███╔╝███████╗██║  ██║
+╚═╝      ╚═════╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═╝
+```
+# interface FactoryInterface (Details)
+> namespace: **VDM\Joomla\Componentbuilder\Interfaces**
+```uml
+@startuml
+interface FactoryInterface  #Lavender {
+  + {static} _(string $key) : Mixed
+  + {static} getContainer() : Container
+}
+
+note right of FactoryInterface::_
+  Get any class from the container
+
+  since: 3.2.0
+  return: Mixed
+end note
+
+note right of FactoryInterface::getContainer
+  Get the global container
+
+  since: 3.2.0
+  return: Container
+end note
+ 
+@enduml
+```
+
+---
+```
+     ██╗ ██████╗██████╗
+     ██║██╔════╝██╔══██╗
+     ██║██║     ██████╔╝
+██   ██║██║     ██╔══██╗
+╚█████╔╝╚██████╗██████╔╝
+ ╚════╝  ╚═════╝╚═════╝
+```
+> Build with [Joomla Component Builder](https://git.vdm.dev/joomla/Component-Builder)
+
diff --git a/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.php b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.php
new file mode 100644
index 0000000..aff5406
--- /dev/null
+++ b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.php
@@ -0,0 +1,42 @@
+<?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\Interfaces;
+
+
+use Joomla\DI\Container;
+
+
+/**
+ * The Container Factory Interface
+ */
+interface FactoryInterface
+{
+	/**
+	 * Get any class from the container
+	 *
+	 * @param   string  $key  The container class key
+	 *
+	 * @return  Mixed
+	 * @since 3.2.0
+	 */
+	public static function _(string $key);
+
+	/**
+	 * Get the global container
+	 *
+	 * @return  Container
+	 * @since 3.2.0
+	 */
+	public static function getContainer(): Container;
+
+}
+
diff --git a/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.power b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.power
new file mode 100644
index 0000000..5a394fe
--- /dev/null
+++ b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/code.power
@@ -0,0 +1,17 @@
+	/**
+	 * Get any class from the container
+	 *
+	 * @param   string  $key  The container class key
+	 *
+	 * @return  Mixed
+	 * @since 3.2.0
+	 */
+	public static function _(string $key);
+
+	/**
+	 * Get the global container
+	 *
+	 * @return  Container
+	 * @since 3.2.0
+	 */
+	public static function getContainer(): Container;
diff --git a/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/settings.json b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/settings.json
new file mode 100644
index 0000000..d1a52a8
--- /dev/null
+++ b/src/caf33c5d-858c-4f9a-894f-ab302ec5445a/settings.json
@@ -0,0 +1,18 @@
+{
+    "add_head": "1",
+    "add_licensing_template": "2",
+    "extends": "0",
+    "guid": "caf33c5d-858c-4f9a-894f-ab302ec5445a",
+    "implements": null,
+    "load_selection": null,
+    "name": "FactoryInterface",
+    "power_version": "1.0.0",
+    "system_name": "JCB.Interfaces.FactoryInterface",
+    "type": "interface",
+    "use_selection": null,
+    "namespace": "VDM\\Joomla\\Componentbuilder.Interfaces.FactoryInterface",
+    "description": "The Container Factory 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",
+    "head": "use Joomla\\DI\\Container;",
+    "composer": ""
+}
\ No newline at end of file
diff --git a/super-powers.json b/super-powers.json
index 9879b65..8361ed9 100644
--- a/super-powers.json
+++ b/super-powers.json
@@ -164,6 +164,17 @@
         "spk": "Super__79d765b3_7319_4988_9730_446c7f347020__Power",
         "guid": "79d765b3-7319-4988-9730-446c7f347020"
     },
+    "caf33c5d-858c-4f9a-894f-ab302ec5445a": {
+        "name": "FactoryInterface",
+        "type": "interface",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Interfaces",
+        "code": "src\/caf33c5d-858c-4f9a-894f-ab302ec5445a\/code.php",
+        "power": "src\/caf33c5d-858c-4f9a-894f-ab302ec5445a\/code.power",
+        "settings": "src\/caf33c5d-858c-4f9a-894f-ab302ec5445a\/settings.json",
+        "path": "src\/caf33c5d-858c-4f9a-894f-ab302ec5445a",
+        "spk": "Super__caf33c5d_858c_4f9a_894f_ab302ec5445a__Power",
+        "guid": "caf33c5d-858c-4f9a-894f-ab302ec5445a"
+    },
     "6cbef8f8-4813-48e3-b05a-65e1aea95171": {
         "name": "Database",
         "type": "abstract class",