diff --git a/app/ae_obj_types_def.py b/app/ae_obj_types_def.py
index 775344c..6c1b81d 100644
--- a/app/ae_obj_types_def.py
+++ b/app/ae_obj_types_def.py
@@ -411,6 +411,107 @@ obj_type_kv_li = {
             'enable', 'hide', 'priority', 'sort', 'group', 'notes', 'created_on', 'updated_on',
             ],
     },
+    'account': {
+        'tbl': 'account',
+        'tbl_default': 'account',
+        'tbl_update': 'account',
+        'mdl': Account_Base,
+        'mdl_default': Account_Base,
+        'mdl_in': Account_Base,
+        'mdl_out': Account_Base,
+    },
+    'account_cfg': {
+        'tbl': 'account_cfg',
+        'tbl_default': 'v_account_cfg',
+        'tbl_update': 'account_cfg',
+        'mdl': Account_Cfg_Base,
+        'mdl_default': Account_Cfg_Base,
+        'mdl_in': Account_Cfg_Base,
+        'mdl_out': Account_Cfg_Base,
+    },
+    'address': {
+        'tbl': 'address',
+        'tbl_default': 'v_address',
+        'tbl_update': 'address',
+        'mdl': Address_Base,
+        'mdl_default': Address_Base,
+        'mdl_in': Address_Base,
+        'mdl_out': Address_Base,
+    },
+    'contact': {
+        'tbl': 'contact',
+        'tbl_default': 'v_contact',
+        'tbl_update': 'contact',
+        'mdl': Contact_Base,
+        'mdl_default': Contact_Base,
+        'mdl_in': Contact_Base,
+        'mdl_out': Contact_Base,
+    },
+    'data_store': {
+        'tbl': 'data_store',
+        'tbl_default': 'v_data_store',
+        'tbl_update': 'data_store',
+        'mdl': Data_Store_Base,
+        'mdl_default': Data_Store_Base,
+        'mdl_in': Data_Store_Base,
+        'mdl_out': Data_Store_Base,
+    },
+    'organization': {
+        'tbl': 'organization',
+        'tbl_default': 'v_organization',
+        'tbl_update': 'organization',
+        'mdl': Organization_Base,
+        'mdl_default': Organization_Base,
+        'mdl_in': Organization_Base,
+        'mdl_out': Organization_Base,
+    },
+    'page': {
+        'tbl': 'page',
+        'tbl_default': 'page',
+        'tbl_update': 'page',
+        'mdl': Page_Base,
+        'mdl_default': Page_Base,
+        'mdl_in': Page_Base,
+        'mdl_out': Page_Base,
+    },
+    'site': {
+        'tbl': 'site',
+        'tbl_default': 'site',
+        'tbl_update': 'site',
+        'mdl': Site_Base,
+        'mdl_default': Site_Base,
+        'mdl_in': Site_Base,
+        'mdl_out': Site_Base,
+    },
+    'site_domain': {
+        'tbl': 'site_domain',
+        'tbl_default': 'v_site_domain',
+        'tbl_alt': 'v_site_domain_fqdn_id',
+        'tbl_update': 'site_domain',
+        'mdl': Site_Domain_Base,
+        'mdl_default': Site_Domain_Base,
+        'mdl_alt': Site_Domain_FQDN_ID_Base,
+        'mdl_in': Site_Domain_Base,
+        'mdl_out': Site_Domain_Base,
+    },
+    'order': {
+        'tbl': 'order',
+        'tbl_default': 'v_order',
+        'tbl_update': 'order',
+        'mdl': Order_Base,
+        'mdl_default': Order_Base,
+        'mdl_in': Order_DB_Base,
+        'mdl_out': Order_Base,
+    },
+    'order_line': {
+        'tbl': 'order_line',
+        'tbl_default': 'v_order_line',
+        'tbl_update': 'order_line',
+        'mdl': Order_Line_Base,
+        'mdl_default': Order_Line_Base,
+        'mdl_in': Order_Line_Base,
+        'mdl_out': Order_Line_Base,
+    },
     # Include the lookup lists.
     # Updated 2025-01-13
     'lu_country': {
@@ -496,36 +597,28 @@ obj_type_kv_li = {
 
 
 # ### Core module objects
-obj_type_kv_li['account'] = {'table_name': 'account', 'tbl_name_update': 'account', 'base_name': Account_Base}
-obj_type_kv_li['account_cfg'] = {'table_name': 'v_account_cfg', 'tbl_name_update': 'account_cfg', 'base_name': Account_Cfg_Base} # NOTE check view name: *_detail?
-# obj_type_kv_li['activity_log'] = {'table_name': 'activity_log', 'tbl_name_update': 'activity_log', 'base_name': Activity_Log_Base}
-obj_type_kv_li['address'] = {'table_name': 'v_address', 'tbl_name_update': 'address', 'base_name': Address_Base}
-#obj_type_kv_li['change_log'] = {'table_name': 'change_log', 'tbl_name_update': 'change_log', 'base_name': Change_Log_Base}
-obj_type_kv_li['contact'] = {'table_name': 'v_contact', 'tbl_name_update': 'contact', 'base_name': Contact_Base}
+# obj_type_kv_li['account'] = {'table_name': 'account', 'tbl_name_update': 'account', 'base_name': Account_Base}
+# obj_type_kv_li['account_cfg'] = {'table_name': 'v_account_cfg', 'tbl_name_update': 'account_cfg', 'base_name': Account_Cfg_Base} # NOTE check view name: *_detail?
+# obj_type_kv_li['address'] = {'table_name': 'v_address', 'tbl_name_update': 'address', 'base_name': Address_Base}
+# obj_type_kv_li['contact'] = {'table_name': 'v_contact', 'tbl_name_update': 'contact', 'base_name': Contact_Base}
 
-obj_type_kv_li['data_store'] = {'table_name': 'v_data_store', 'tbl_name_update': 'data_store', 'base_name': Data_Store_Base}
-
-# obj_type_kv_li['hosted_file'] = {'table_name': 'v_hosted_file', 'tbl_name_update': 'hosted_file', 'base_name': Hosted_File_Base}
-# #obj_type_kv_li['hosted_file_link'] = {'table_name': 'hosted_file_link', 'tbl_name_update': 'hosted_file_link', 'base_name': Hosted_File_Link_Base}
+# obj_type_kv_li['data_store'] = {'table_name': 'v_data_store', 'tbl_name_update': 'data_store', 'base_name': Data_Store_Base}
 
 obj_type_kv_li['log_client_viewing'] = {'table_name': 'log_client_viewing', 'tbl_name_update': 'log_client_viewing', 'base_name': Log_Client_Viewing_Base}
 
-obj_type_kv_li['order'] = {'table_name': 'v_order', 'tbl_name_update': 'order', 'base_name': Order_Base}
+# obj_type_kv_li['order'] = {'table_name': 'v_order', 'tbl_name_update': 'order', 'base_name': Order_Base}
 obj_type_kv_li['order_cart'] = {'table_name': 'v_order_cart', 'tbl_name_update': 'order_cart', 'base_name': Order_Cart_Base}
 obj_type_kv_li['order_cart_line'] = {'table_name': 'v_order_cart_line', 'tbl_name_update': 'order_cart_line', 'base_name': Order_Cart_Line_Base}
-obj_type_kv_li['order_line'] = {'table_name': 'v_order_line', 'tbl_name_update': 'order_line', 'base_name': Order_Line_Base}
+# obj_type_kv_li['order_line'] = {'table_name': 'v_order_line', 'tbl_name_update': 'order_line', 'base_name': Order_Line_Base}
 #obj_type_kv_li['order_transaction'] = {'table_name': 'order_transaction', 'tbl_name_update': 'order_transaction', 'base_name': Order_Transaction_Base}
 
-obj_type_kv_li['organization'] = {'table_name': 'v_organization', 'tbl_name_update': 'organization', 'base_name': Organization_Base}
+# obj_type_kv_li['organization'] = {'table_name': 'v_organization', 'tbl_name_update': 'organization', 'base_name': Organization_Base}
 
-obj_type_kv_li['page'] = {'table_name': 'page', 'tbl_name_update': 'page', 'base_name': Page_Base}
+# obj_type_kv_li['page'] = {'table_name': 'page', 'tbl_name_update': 'page', 'base_name': Page_Base}
 
-# obj_type_kv_li['person'] = {'table_name': 'v_person', 'tbl_name_update': 'person', 'base_name': Person_Base}
+# obj_type_kv_li['site'] = {'table_name': 'site', 'tbl_name_update': 'site', 'base_name': Site_Base}
+# obj_type_kv_li['site_domain'] = {'table_name': 'v_site_domain', 'table_name_alt': 'v_site_domain_fqdn_id', 'tbl_name_update': 'site_domain', 'base_name': Site_Domain_Base, 'base_name_alt': Site_Domain_FQDN_ID_Base} # NOTE check view name: *_detail?
 
-obj_type_kv_li['site'] = {'table_name': 'site', 'tbl_name_update': 'site', 'base_name': Site_Base}
-obj_type_kv_li['site_domain'] = {'table_name': 'v_site_domain', 'table_name_alt': 'v_site_domain_fqdn_id', 'tbl_name_update': 'site_domain', 'base_name': Site_Domain_Base, 'base_name_alt': Site_Domain_FQDN_ID_Base} # NOTE check view name: *_detail?
-
-# obj_type_kv_li['user'] = {'table_name': 'v_user', 'tbl_name_update': 'user', 'base_name': User_Base}
 obj_type_kv_li['user_role'] = {'table_name': 'v_user_role', 'tbl_name_update': 'user_role', 'base_name': User_Role_Base} # NOTE check view name: *_detail?