diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue
index aa643856f7..5ae9abaa4d 100644
--- a/src/components/AppHeader/AppHeader.vue
+++ b/src/components/AppHeader/AppHeader.vue
@@ -119,7 +119,7 @@ import IconMenu from '@carbon/icons-vue/es/menu/20';
 import IconRenew from '@carbon/icons-vue/es/renew/20';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
 import useToast from '@/components/Composables/useToastComposable';
-import { AuthenticationStore, GlobalStore, EventLogStore } from '@/store';
+import stores from '@/store';
 import i18n from '@/i18n';
 import eventBus from '@/eventBus';
 import { useRouter } from 'vue-router';
@@ -127,9 +127,9 @@ import { useRouter } from 'vue-router';
 const { errorToast } = useToast();
 const router = useRouter();
 
-const authenticationStore = AuthenticationStore();
-const global = GlobalStore();
-const eventLogStore = EventLogStore();
+const authenticationStore = stores.AuthenticationStore();
+const global = stores.GlobalStore();
+const eventLogStore = stores.EventLogStore();
 
 const props = defineProps({
   routerKey: {
diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue
index cc8f85a4cd..ead4819947 100644
--- a/src/components/AppNavigation/AppNavigation.vue
+++ b/src/components/AppNavigation/AppNavigation.vue
@@ -1,6 +1,7 @@
-<!-- Work Requird -->
 <template>
-  <div>
+  <div
+    v-if="(modelType !== '--' && hmcMangedInfo !== null) || loadingCompleted"
+  >
     <div class="nav-container" :class="{ open: isNavigationOpen }">
       <nav ref="nav" :aria-label="$t('appNavigation.primaryNavigation')">
         <BNav vertical class="mb-4">
@@ -29,9 +30,9 @@
                 <icon-chevron-up class="icon-expand" />
               </BButton>
               <BCollapse :id="navItem.id" class="nav-item__nav">
-                <li class="">
+                <li>
                   <router-link
-                    v-for="(subNavItem, i) of filteredNavItem(navItem.children)"
+                    v-for="(subNavItem, i) of navItem.children"
                     :key="i"
                     :to="subNavItem.route"
                     :data-test-id="`nav-item-${subNavItem.id}`"
@@ -58,43 +59,53 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue';
-import { AppNavigationData } from './AppNavigationData';
+//Do not change Mixin import.
+//Exact match alias set to support
+//dotenv customizations.
+import { ref, watch, onMounted, computed } from 'vue';
+import AppNavigationData from './AppNavigationData';
 import { useRoute } from 'vue-router';
-import { onMounted } from 'vue';
-import { GlobalStore } from '@/store';
 import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
-const globalStore = GlobalStore();
-const { navigationItems } = AppNavigationData();
-let isNavigationOpen = ref(false);
-const route = useRoute();
-let currentUserRole = ref(null);
-onMounted(() => {
-  currentUserRole.value = globalStore.userPrivilege;
-  eventBus.on('toggle-navigation', toggleIsOpen);
-});
-// provide('isNavigationOpen', isNavigationOpen);
-watch(route, () => {
-  isNavigationOpen.value = false;
-});
-watch(isNavigationOpen, () => {
-  eventBus.emit('change-is-navigation-open', isNavigationOpen.value);
-});
-const toggleIsOpen = () => {
-  isNavigationOpen.value = !isNavigationOpen.value;
-};
-// provide('toggle-navigation', toggleIsOpen);
+const navigationItems = AppNavigationData().navigationItems;
+const globalStore = stores.GlobalStore();
+const userManagementStore = stores.UserManagementStore();
+  const isNavigationOpen = ref(false);
+  const loadingCompleted = ref(false);
+  const route = useRoute();
 
-const filteredNavItem = (navItem) => {
-  if (currentUserRole.value) {
-    return navItem.filter(({ exclusiveToRoles }) => {
-      if (!exclusiveToRoles?.length) return true;
-      return exclusiveToRoles.includes(currentUserRole);
+  const modelType = computed(() => {
+    return globalStore.modelTypeGetter;
+  });
+  const hmcMangedInfo = computed(() => {
+    return globalStore.hmcManagedGetter;
+  });
+  const currentUser = computed(() => {
+    return globalStore.currentUserGetter;
+  });
+  watch(route, () => {
+    isNavigationOpen.value = false;
+  });
+  watch(isNavigationOpen, () => {
+    eventBus.emit('change-is-navigation-open', isNavigationOpen.value);
+  });
+  onMounted(() => {
+    eventBus.on('loading-bar-status', (value) => {
+      loadingCompleted.value = value;
     });
-  } else return navItem;
-};
+    eventBus.on('toggle-navigation', toggleIsOpen);
+  });
+  const checkForUserData = () => {
+      if (!currentUser.value) {
+        userManagementStore.getUsers();
+        globalStore.getCurrentUser();
+      }
+    };
+  const toggleIsOpen = () => {
+      isNavigationOpen.value = !isNavigationOpen.value;
+  };
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/AppNavigation/AppNavigationData.js b/src/components/AppNavigation/AppNavigationData.js
index 4d11c18a6c..bb9d592c28 100644
--- a/src/components/AppNavigation/AppNavigationData.js
+++ b/src/components/AppNavigation/AppNavigationData.js
@@ -1,433 +1,210 @@
-// TODO: Work Requird -->
-
-// import iconDashboard from '@carbon/icons-vue/es/dashboard/16';
-// import iconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16';
-// import iconDataCheck from '@carbon/icons-vue/es/data--check/16';
-// import iconSettings from '@carbon/icons-vue/es/settings/16';
-// import iconSecurity from '@carbon/icons-vue/es/security/16';
-// import iconDataBase from '@carbon/icons-vue/es/data--base--alt/16';
 import IconDashboard from '@carbon/icons-vue/es/dashboard/16';
 import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16';
 import IconDataCheck from '@carbon/icons-vue/es/data--check/16';
 import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16';
 import IconSettings from '@carbon/icons-vue/es/settings/16';
 import IconSecurity from '@carbon/icons-vue/es/security/16';
-// import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16';
 import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16';
-import IconDocument from '@carbon/icons-vue/es/document/16';
 import i18n from '@/i18n';
-// const roles = {
-//   administrator: 'Administrator',
-//   operator: 'Operator',
-//   readonly: 'ReadOnly',
-//   noaccess: 'NoAccess',
-// };
-export function AppNavigationData() {
-  // const navigationItems = [
-  //   {
-  //     id: 'overview',
-  //     label: i18n.global.t('appNavigation.overview'),
-  //     route: '/',
-  //     icon: iconDashboard,
-  //   },
-  //   {
-  //     id: 'logs',
-  //     label: i18n.global.t('appNavigation.logs'),
-  //     icon: iconTextLinkAnalysis,
-  //     children: [
-  //       {
-  //         id: 'event-logs',
-  //         label: i18n.global.t('appNavigation.eventLogs'),
-  //         route: '/logs/event-logs',
-  //       },
-  //       {
-  //         id: 'post-code-logs',
-  //         label: i18n.global.t('appNavigation.postCodeLogs'),
-  //         route: '/logs/post-code-logs',
-  //       },
-  //     ],
-  //   },
-  //   {
-  //     id: 'hardware-status',
-  //     label: i18n.global.t('appNavigation.hardwareStatus'),
-  //     icon: iconDataCheck,
-  //     children: [
-  //       {
-  //         id: 'inventory',
-  //         label: i18n.global.t('appNavigation.inventory'),
-  //         route: '/hardware-status/inventory',
-  //       },
-  //       {
-  //         id: 'sensors',
-  //         label: i18n.global.t('appNavigation.sensors'),
-  //         route: '/hardware-status/sensors',
-  //       },
-  //     ],
-  //   },
-  //   {
-  //     id: 'operations',
-  //     label: i18n.global.t('appNavigation.operations'),
-  //     icon: IconSettingsAdjust,
-  //     children: [
-  //       {
-  //         id: 'factory-reset',
-  //         label: i18n.global.t('appNavigation.factoryReset'),
-  //         route: '/operations/factory-reset',
-  //       },
-  //       {
-  //         id: 'kvm',
-  //         label: i18n.global.t('appNavigation.kvm'),
-  //         route: '/operations/kvm',
-  //       },
-  //       {
-  //         id: 'key-clear',
-  //         label: i18n.global.t('appNavigation.keyClear'),
-  //         route: '/operations/key-clear',
-  //       },
-  //       {
-  //         id: 'firmware',
-  //         label: i18n.global.t('appNavigation.firmware'),
-  //         route: '/operations/firmware',
-  //       },
-  //       {
-  //         id: 'reboot-bmc',
-  //         label: i18n.global.t('appNavigation.rebootBmc'),
-  //         route: '/operations/reboot-bmc',
-  //       },
-  //       {
-  //         id: 'server-power-operations',
-  //         label: i18n.global.t('appNavigation.serverPowerOperations'),
-  //         route: '/operations/server-power-operations',
-  //       },
-  //       {
-  //         id: 'virtual-media',
-  //         label: i18n.global.t('appNavigation.virtualMedia'),
-  //         route: '/operations/virtual-media',
-  //         exclusiveToRoles: [roles.administrator],
-  //       },
-  //     ],
-  //   },
-  //   {
-  //     id: 'settings',
-  //     label: i18n.global.t('appNavigation.settings'),
-  //     icon: iconSettings,
-  //     children: [
-  //       {
-  //         id: 'date-time',
-  //         label: i18n.global.t('appNavigation.dateTime'),
-  //         route: '/settings/date-time',
-  //       },
-  //       {
-  //         id: 'network',
-  //         label: i18n.global.t('appNavigation.network'),
-  //         route: '/settings/network',
-  //       },
-  //       {
-  //         id: 'power-restore-policy',
-  //         label: i18n.global.t('appNavigation.powerRestorePolicy'),
-  //         route: '/settings/power-restore-policy',
-  //       },
-  //       {
-  //         id: 'snmp-alerts',
-  //         label: i18n.global.t('appNavigation.snmpAlerts'),
-  //         route: '/settings/snmp-alerts',
-  //       },
-  //     ],
-  //   },
-  //   {
-  //     id: 'security-and-access',
-  //     label: i18n.global.t('appNavigation.securityAndAccess'),
-  //     icon: iconSecurity,
-  //     children: [
-  //       {
-  //         id: 'sessions',
-  //         label: i18n.global.t('appNavigation.sessions'),
-  //         route: '/security-and-access/sessions',
-  //       },
-  //       {
-  //         id: 'ldap',
-  //         label: i18n.global.t('appNavigation.ldap'),
-  //         route: '/security-and-access/ldap',
-  //       },
-  //       {
-  //         id: 'user-management',
-  //         label: i18n.global.t('appNavigation.userManagement'),
-  //         route: '/security-and-access/user-management',
-  //       },
-  //       {
-  //         id: 'policies',
-  //         label: i18n.global.t('appNavigation.policies'),
-  //         route: '/security-and-access/policies',
-  //       },
-  //       {
-  //         id: 'certificates',
-  //         label: i18n.global.t('appNavigation.certificates'),
-  //         route: '/security-and-access/certificates',
-  //       },
-  //     ],
-  //   },
-  //   {
-  //     id: 'resource-management',
-  //     label: i18n.global.t('appNavigation.resourceManagement'),
-  //     icon: iconDataBase,
-  //     children: [
-  //       {
-  //         id: 'power',
-  //         label: i18n.global.t('appNavigation.power'),
-  //         route: '/resource-management/power',
-  //       },
-  //     ],
-  //   },
-  // ];
+
+const AppNavigationData = () => {
   const navigationItems = [
-    {
-      id: 'overview',
-      label: i18n.global.t('appNavigation.overview'),
-      route: '/',
-      icon: IconDashboard,
-    },
-    {
-      id: 'operations',
-      label: i18n.global.t('appNavigation.operations'),
-      icon: IconSettingsAdjust,
-      children: [
         {
-          id: 'server-power-operations',
-          label: i18n.global.t('appNavigation.serverPowerOperations'),
-          route: '/operations/server-power-operations',
-          restrictTo: [],
-        },
-        {
-          id: 'host-console',
-          label: i18n.global.t('appNavigation.hostConsole'),
-          route: '/operations/host-console',
-          restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-        },
-        {
-          id: 'service-login',
-          label: i18n.global.t('appPageTitle.serviceLogin'),
-          route: '/operations/service-login',
-          restrictTo: ['OemIBMServiceAgent'],
-        },
-        {
-          id: 'firmware',
-          label: i18n.global.t('appNavigation.firmware'),
-          route: '/operations/firmware',
-          restrictTo: [],
-        },
-        {
-          id: 'reboot-bmc',
-          label: i18n.global.t('appNavigation.rebootBmc'),
-          route: '/operations/reboot-bmc',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'resource-management',
-      label: i18n.global.t('appNavigation.resourceManagement'),
-      icon: IconDataBase,
-      children: [
-        {
-          id: 'memory',
-          label: i18n.global.t('appNavigation.memory'),
-          route: '/resource-management/memory',
-          restrictTo: [],
-        },
-        {
-          id: 'power',
-          label: i18n.global.t('appNavigation.power'),
-          route: '/resource-management/power',
-          restrictTo: [],
-        },
-        {
-          id: 'capacity-on-demand',
-          label: i18n.global.t('appNavigation.capacityOnDemand'),
-          route: '/resource-management/capacity-on-demand',
-          restrictTo: [],
-        },
-        {
-          id: 'field-core-override',
-          label: i18n.global.t('appNavigation.fieldCoreOverride'),
-          route: '/resource-management/field-core-override',
-          restrictTo: [],
-        },
-        {
-          id: 'system-parameters',
-          label: i18n.global.t('appNavigation.systemParameters'),
-          route: '/resource-management/system-parameters',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'hardware-status',
-      label: i18n.global.t('appNavigation.hardwareStatus'),
-      icon: IconDataCheck,
-      children: [
-        {
-          id: 'inventory',
-          label: i18n.global.t('appNavigation.inventory'),
-          route: '/hardware-status/inventory',
-          restrictTo: [],
-        },
-        {
-          id: 'sensors',
-          label: i18n.global.t('appNavigation.sensors'),
-          route: '/hardware-status/sensors',
-          restrictTo: [],
-        },
-        {
-          id: 'hardware-deconfiguration',
-          label: i18n.global.t('appNavigation.deconfigurationHardware'),
-          route: '/settings/hardware-deconfiguration',
-          restrictTo: [],
-        },
-        {
-          id: 'pcie-topology',
-          label: i18n.global.t('appNavigation.pcieTopology'),
-          route: '/hardware-status/pcie-topology',
-          restrictTo: [],
-        },
-        {
-          id: 'concurrent-maintenance',
-          label: i18n.global.t('appNavigation.concurrentMaintenance'),
-          route: '/hardware-status/concurrent-maintenance',
-          restrictTo: ['Everest'],
-        },
-      ],
-    },
-    {
-      id: 'logs',
-      label: i18n.global.t('appNavigation.logs'),
-      icon: IconTextLinkAnalysis,
-      children: [
-        {
-          id: 'post-code-logs',
-          label: i18n.global.t('appNavigation.postCodeLogs'),
-          route: '/logs/post-code-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'event-logs',
-          label: i18n.global.t('appNavigation.eventLogs'),
-          route: '/logs/event-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'audit-logs',
-          label: i18n.global.t('appNavigation.auditLogs'),
-          route: '/logs/audit-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'dumps',
-          label: i18n.global.t('appNavigation.dumps'),
-          route: '/logs/dumps',
-          restrictTo: [],
-        },
-        {
-          id: 'ibmi-service-functions',
-          label: i18n.global.t('appNavigation.ibmiServiceFunctions'),
-          route: '/logs/ibmi-service-functions',
-          restrictTo: ['NonHMCManaged'],
-        },
-        {
-          id: 'deconfiguration-records',
-          label: i18n.global.t('appNavigation.deconfigurationRecords'),
-          route: '/logs/deconfiguration-records',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'settings',
-      label: i18n.global.t('appNavigation.settings'),
-      icon: IconSettings,
-      children: [
-        {
-          id: 'date-time',
-          label: i18n.global.t('appNavigation.dateTime'),
-          route: '/settings/date-time',
-          restrictTo: [],
-        },
-        {
-          id: 'network',
-          label: i18n.global.t('appNavigation.network'),
-          route: '/settings/network',
-          restrictTo: [],
-        },
-        {
-          id: 'power-restore-policy',
-          label: i18n.global.t('appNavigation.powerRestorePolicy'),
-          route: '/settings/power-restore-policy',
-          restrictTo: [],
-        },
-        {
-          id: 'snmp-alerts',
-          label: i18n.global.t('appNavigation.snmpAlerts'),
-          route: '/settings/snmp-alerts',
-          restrictTo: [],
-        },
-        {
-          id: 'factory-reset',
-          label: i18n.global.t('appNavigation.factoryReset'),
-          route: '/operations/factory-reset',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'security-and-access',
-      label: i18n.global.t('appNavigation.securityAndAccess'),
-      icon: IconSecurity,
-      children: [
-        {
-          id: 'sessions',
-          label: i18n.global.t('appNavigation.sessions'),
-          route: '/security-and-access/sessions',
-          restrictTo: [],
-        },
-        {
-          id: 'user-management',
-          label: i18n.global.t('appNavigation.userManagement'),
-          route: '/security-and-access/user-management',
-          restrictTo: [],
-        },
-        {
-          id: 'ldap',
-          label: i18n.global.t('appNavigation.ldap'),
-          route: '/security-and-access/ldap',
-          restrictTo: [],
-        },
-        {
-          id: 'certificates',
-          label: i18n.global.t('appNavigation.certificates'),
-          route: '/security-and-access/certificates',
-          restrictTo: [],
-        },
-        {
-          id: 'policies',
-          label: i18n.global.t('appNavigation.policies'),
-          route: '/security-and-access/policies',
-          restrictTo: [],
-        },
-        {
-          id: 'key-clear',
-          label: i18n.global.t('appNavigation.keyClear'),
-          route: '/operations/key-clear',
-          restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-        },
-      ],
-    },
-    {
-      id: 'notices',
-      label: i18n.global.t('appNavigation.notices'),
-      route: '/notices',
-      icon: IconDocument,
-    },
-  ];
+          id: 'overview',
+          label: i18n.global.t('appNavigation.overview'),
+          route: '/',
+          icon: IconDashboard,
+        },
+        {
+          id: 'logs',
+          label: i18n.global.t('appNavigation.logs'),
+          icon: IconTextLinkAnalysis,
+          children: [
+            {
+              id: 'event-logs',
+              label: i18n.global.t('appNavigation.eventLogs'),
+              route: '/logs/event-logs',
+            },
+            {
+              id: 'audit-logs',
+              label: i18n.global.t('appNavigation.auditLogs'),
+              route: '/logs/audit-logs',
+            },
+            {
+              id: 'post-code-logs',
+              label: i18n.global.t('appNavigation.postCodeLogs'),
+              route: '/logs/post-code-logs',
+            },
+          ],
+        },
+        {
+          id: 'hardware-status',
+          label: i18n.global.t('appNavigation.hardwareStatus'),
+          icon: IconDataCheck,
+          children: [
+            {
+              id: 'inventory',
+              label: i18n.global.t('appNavigation.inventory'),
+              route: '/hardware-status/inventory',
+            },
+            {
+              id: 'sensors',
+              label: i18n.global.t('appNavigation.sensors'),
+              route: '/hardware-status/sensors',
+            },
+            {
+              id: 'pcie-topology',
+              label: i18n.global.t('appNavigation.pcieTopology'),
+              route: '/hardware-status/pcie-topology',
+            },
+            {
+              id: 'concurrent-maintenance',
+              label: i18n.global.t('appNavigation.concurrentMaintenance'),
+              route: '/hardware-status/concurrent-maintenance',
+            },
+          ],
+        },
+        {
+          id: 'operations',
+          label: i18n.global.t('appNavigation.operations'),
+          icon: IconSettingsAdjust,
+          children: [
+            {
+              id: 'factory-reset',
+              label: i18n.global.t('appNavigation.factoryReset'),
+              route: '/operations/factory-reset',
+            },
+            {
+              id: 'kvm',
+              label: i18n.global.t('appNavigation.kvm'),
+              route: '/operations/kvm',
+            },
+            {
+              id: 'key-clear',
+              label: i18n.global.t('appNavigation.keyClear'),
+              route: '/operations/key-clear',
+            },
+            {
+              id: 'firmware',
+              label: i18n.global.t('appNavigation.firmware'),
+              route: '/operations/firmware',
+            },
+            {
+              id: 'reboot-bmc',
+              label: i18n.global.t('appNavigation.rebootBmc'),
+              route: '/operations/reboot-bmc',
+            },
+            {
+              id: 'service-login',
+              label: i18n.global.t('appNavigation.serviceLogin'),
+              route: '/operations/service-login',
+            },
+            {
+              id: 'host-console',
+              label: i18n.global.t('appNavigation.hostConsole'),
+              route: '/operations/host-console',
+            },
+            {
+              id: 'server-power-operations',
+              label: i18n.global.t('appNavigation.serverPowerOperations'),
+              route: '/operations/server-power-operations',
+            },
+            {
+              id: 'virtual-media',
+              label: i18n.global.t('appNavigation.virtualMedia'),
+              route: '/operations/virtual-media',
+            },
+          ],
+        },
+        {
+          id: 'settings',
+          label: i18n.global.t('appNavigation.settings'),
+          icon: IconSettings,
+          children: [
+            {
+              id: 'date-time',
+              label: i18n.global.t('appNavigation.dateTime'),
+              route: '/settings/date-time',
+            },
+            {
+              id: 'hardware-deconfiguration',
+              label: i18n.global.t('appNavigation.deconfigurationHardware'),
+              route: '/settings/hardware-deconfiguration',
+            },
+            {
+              id: 'network',
+              label: i18n.global.t('appNavigation.network'),
+              route: '/settings/network',
+            },
+            {
+              id: 'power-restore-policy',
+              label: i18n.global.t('appNavigation.powerRestorePolicy'),
+              route: '/settings/power-restore-policy',
+            },
+            {
+              id: 'snmp-alerts',
+              label: i18n.global.t('appNavigation.snmpAlerts'),
+              route: '/settings/snmp-alerts',
+            },
+          ],
+        },
+        {
+          id: 'security-and-access',
+          label: i18n.global.t('appNavigation.securityAndAccess'),
+          icon: IconSecurity,
+          children: [
+            {
+              id: 'sessions',
+              label: i18n.global.t('appNavigation.sessions'),
+              route: '/security-and-access/sessions',
+            },
+            {
+              id: 'ldap',
+              label: i18n.global.t('appNavigation.ldap'),
+              route: '/security-and-access/ldap',
+            },
+            {
+              id: 'user-management',
+              label: i18n.global.t('appNavigation.userManagement'),
+              route: '/security-and-access/user-management',
+            },
+            {
+              id: 'policies',
+              label: i18n.global.t('appNavigation.policies'),
+              route: '/security-and-access/policies',
+            },
+            {
+              id: 'certificates',
+              label: i18n.global.t('appNavigation.certificates'),
+              route: '/security-and-access/certificates',
+            },
+          ],
+        },
+        {
+          id: 'resource-management',
+          label: i18n.global.t('appNavigation.resourceManagement'),
+          icon: IconDataBase,
+          children: [
+            {
+              id: 'system-parameters',
+              label: i18n.global.t('appNavigation.systemParameters'),
+              route: '/resource-management/system-parameters',
+            },
+            {
+              id: 'memory',
+              label: i18n.global.t('appNavigation.memory'),
+              route: '/resource-management/memory',
+            },
+            {
+              id: 'power',
+              label: i18n.global.t('appNavigation.power'),
+              route: '/resource-management/power',
+            },
+          ],
+        },
+      ]
   return {
     navigationItems,
   };
 }
+export default AppNavigationData;
diff --git a/src/components/Composables/useTableFilterComposable.js b/src/components/Composables/useTableFilterComposable.js
index bea9d02b93..3515721192 100644
--- a/src/components/Composables/useTableFilterComposable.js
+++ b/src/components/Composables/useTableFilterComposable.js
@@ -1,8 +1,8 @@
 import { includes } from 'lodash';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 
 export default function useTableFilter() {
-  const globalStore = GlobalStore();
+  const globalStore = stores.GlobalStore();
   const getFilteredTableData = (tableData = [], filters = []) => {
     const filterItems = filters.reduce((arr, filter) => {
       return [...arr, ...filter.values];
diff --git a/src/components/utilities/dateFilter.js b/src/components/utilities/dateFilter.js
index 7595842f13..201af2427d 100644
--- a/src/components/utilities/dateFilter.js
+++ b/src/components/utilities/dateFilter.js
@@ -1,9 +1,9 @@
 // Work required
 import { format } from 'date-fns';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 
 const globalStore = () => {
-  return GlobalStore();
+  return stores.GlobalStore();
 };
 
 // Short time zone filter
diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index 2ff840a1e9..caca0a561d 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -1,1013 +1,272 @@
-// TODO: Work Requird
 import IconDashboard from '@carbon/icons-vue/es/dashboard/16';
 import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16';
 import IconDataCheck from '@carbon/icons-vue/es/data--check/16';
 import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16';
 import IconSettings from '@carbon/icons-vue/es/settings/16';
 import IconSecurity from '@carbon/icons-vue/es/security/16';
-// import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16';
 import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16';
 import IconDocument from '@carbon/icons-vue/es/document/16';
-// import i18n from '@/i18n';
-// const roles = {
-//   administrator: 'Administrator',
-//   operator: 'Operator',
-//   readonly: 'ReadOnly',
-//   noaccess: 'NoAccess',
-// };
-
-// const AppNavigationMixin = {
-//   components: {
-//     iconOverview: IconDashboard,
-//     iconLogs: IconTextLinkAnalysis,
-//     iconHealth: IconDataCheck,
-//     iconControl: IconSettingsAdjust,
-//     iconSettings: IconSettings,
-//     iconSecurityAndAccess: IconSecurity,
-//     iconExpand: IconChevronUp,
-//     iconResourceManagement: IconDataBase,
-//     iconDocument: IconDocument,
-//   },
-//   data() {
-//     return {
-//       navigationData: [
-//         {
-//           id: 'overview',
-//           label: i18n.global.t('appNavigation.overview'),
-//           route: '/',
-//           icon: 'iconOverview',
-//         },
-//         {
-//           id: 'operations',
-//           label: i18n.global.t('appNavigation.operations'),
-//           icon: 'iconControl',
-//           children: [
-//             {
-//               id: 'server-power-operations',
-//               label: i18n.global.t('appNavigation.serverPowerOperations'),
-//               route: '/operations/server-power-operations',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'host-console',
-//               label: i18n.global.t('appNavigation.hostConsole'),
-//               route: '/operations/host-console',
-//               restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-//             },
-//             {
-//               id: 'service-login',
-//               label: i18n.global.t('appPageTitle.serviceLogin'),
-//               route: '/operations/service-login',
-//               restrictTo: ['OemIBMServiceAgent'],
-//             },
-//             {
-//               id: 'firmware',
-//               label: i18n.global.t('appNavigation.firmware'),
-//               route: '/operations/firmware',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'reboot-bmc',
-//               label: i18n.global.t('appNavigation.rebootBmc'),
-//               route: '/operations/reboot-bmc',
-//               restrictTo: [],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'resource-management',
-//           label: i18n.global.t('appNavigation.resourceManagement'),
-//           icon: 'iconResourceManagement',
-//           children: [
-//             {
-//               id: 'memory',
-//               label: i18n.global.t('appNavigation.memory'),
-//               route: '/resource-management/memory',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'power',
-//               label: i18n.global.t('appNavigation.power'),
-//               route: '/resource-management/power',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'capacity-on-demand',
-//               label: i18n.global.t('appNavigation.capacityOnDemand'),
-//               route: '/resource-management/capacity-on-demand',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'field-core-override',
-//               label: i18n.global.t('appNavigation.fieldCoreOverride'),
-//               route: '/resource-management/field-core-override',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'system-parameters',
-//               label: i18n.global.t('appNavigation.systemParameters'),
-//               route: '/resource-management/system-parameters',
-//               restrictTo: [],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'hardware-status',
-//           label: i18n.global.t('appNavigation.hardwareStatus'),
-//           icon: 'iconHealth',
-//           children: [
-//             {
-//               id: 'inventory',
-//               label: i18n.global.t('appNavigation.inventory'),
-//               route: '/hardware-status/inventory',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'sensors',
-//               label: i18n.global.t('appNavigation.sensors'),
-//               route: '/hardware-status/sensors',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'hardware-deconfiguration',
-//               label: i18n.global.t('appNavigation.deconfigurationHardware'),
-//               route: '/settings/hardware-deconfiguration',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'pcie-topology',
-//               label: i18n.global.t('appNavigation.pcieTopology'),
-//               route: '/hardware-status/pcie-topology',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'concurrent-maintenance',
-//               label: i18n.global.t('appNavigation.concurrentMaintenance'),
-//               route: '/hardware-status/concurrent-maintenance',
-//               restrictTo: ['Everest'],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'logs',
-//           label: i18n.global.t('appNavigation.logs'),
-//           icon: 'iconLogs',
-//           children: [
-//             {
-//               id: 'post-code-logs',
-//               label: i18n.global.t('appNavigation.postCodeLogs'),
-//               route: '/logs/post-code-logs',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'event-logs',
-//               label: i18n.global.t('appNavigation.eventLogs'),
-//               route: '/logs/event-logs',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'audit-logs',
-//               label: i18n.global.t('appNavigation.auditLogs'),
-//               route: '/logs/audit-logs',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'dumps',
-//               label: i18n.global.t('appNavigation.dumps'),
-//               route: '/logs/dumps',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'ibmi-service-functions',
-//               label: i18n.global.t('appNavigation.ibmiServiceFunctions'),
-//               route: '/logs/ibmi-service-functions',
-//               restrictTo: ['NonHMCManaged'],
-//             },
-//             {
-//               id: 'deconfiguration-records',
-//               label: i18n.global.t('appNavigation.deconfigurationRecords'),
-//               route: '/logs/deconfiguration-records',
-//               restrictTo: [],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'settings',
-//           label: i18n.global.t('appNavigation.settings'),
-//           icon: 'iconSettings',
-//           children: [
-//             {
-//               id: 'date-time',
-//               label: i18n.global.t('appNavigation.dateTime'),
-//               route: '/settings/date-time',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'network',
-//               label: i18n.global.t('appNavigation.network'),
-//               route: '/settings/network',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'power-restore-policy',
-//               label: i18n.global.t('appNavigation.powerRestorePolicy'),
-//               route: '/settings/power-restore-policy',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'snmp-alerts',
-//               label: i18n.global.t('appNavigation.snmpAlerts'),
-//               route: '/settings/snmp-alerts',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'factory-reset',
-//               label: i18n.global.t('appNavigation.factoryReset'),
-//               route: '/operations/factory-reset',
-//               restrictTo: [],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'security-and-access',
-//           label: i18n.global.t('appNavigation.securityAndAccess'),
-//           icon: 'iconSecurityAndAccess',
-//           children: [
-//             {
-//               id: 'sessions',
-//               label: i18n.global.t('appNavigation.sessions'),
-//               route: '/security-and-access/sessions',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'user-management',
-//               label: i18n.global.t('appNavigation.userManagement'),
-//               route: '/security-and-access/user-management',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'ldap',
-//               label: i18n.global.t('appNavigation.ldap'),
-//               route: '/security-and-access/ldap',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'certificates',
-//               label: i18n.global.t('appNavigation.certificates'),
-//               route: '/security-and-access/certificates',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'policies',
-//               label: i18n.global.t('appNavigation.policies'),
-//               route: '/security-and-access/policies',
-//               restrictTo: [],
-//             },
-//             {
-//               id: 'key-clear',
-//               label: i18n.global.t('appNavigation.keyClear'),
-//               route: '/operations/key-clear',
-//               restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-//             },
-//           ],
-//         },
-//         {
-//           id: 'notices',
-//           label: i18n.global.t('appNavigation.notices'),
-//           route: '/notices',
-//           icon: 'iconDocument',
-//         },
-//       ],
-//     };
-//   },
-//   computed: {
-//     roleId() {
-//       return this.$store?.getters?.['global/currentUser']?.RoleId;
-//     },
-//     model() {
-//       if (this.systemInfo?.startsWith('9043')) {
-//         return 'Everest';
-//       } else {
-//         return 'NotEverest';
-//       }
-//     },
-//     systemInfo() {
-//       return this.$store?.getters['global/modelType'];
-//     },
-//     isHmcManged() {
-//       if (this.hmcInfo === 'Enabled') {
-//         return 'HMCManaged';
-//       } else {
-//         return 'NonHMCManaged';
-//       }
-//     },
-//     hmcInfo() {
-//       return this.$store?.getters['global/hmcManaged'];
-//     },
-//     navigationItems() {
-//       return this.navigationData.map((section) => {
-//         let restrictedPages = [];
-//         section.children?.map((page) => {
-//           if (page.restrictTo.length > 0) {
-//             const isPageNeeded =
-//               page.restrictTo.filter(
-//                 (requiredRole) =>
-//                   requiredRole === this.roleId ||
-//                   requiredRole === this.model ||
-//                   requiredRole === this.isHmcManged
-//               ).length > 0;
-//             if (!isPageNeeded) restrictedPages.push(page);
-//           }
-//         });
-//         if (section?.children && section?.children.length > 0) {
-//           let finalSection = section?.children.filter(
-//             (item) => !restrictedPages.includes(item)
-//           );
-//           section.children = finalSection;
-//         }
-//         return section;
-//       });
-//     },
-//   },
-//   created() {
-//     this.$store.dispatch('global/getHmcManaged');
-//   },
-// };
-// export function AppNavigationData() {
-//   const navigationItems = [
-//     // {
-//     //   id: 'overview',
-//     //   label: i18n.global.t('appNavigation.overview'),
-//     //   route: '/',
-//     //   icon: iconDashboard,
-//     // },
-//     // {
-//     //   id: 'logs',
-//     //   label: i18n.global.t('appNavigation.logs'),
-//     //   icon: iconTextLinkAnalysis,
-//     //   children: [
-//     //     {
-//     //       id: 'event-logs',
-//     //       label: i18n.global.t('appNavigation.eventLogs'),
-//     //       route: '/logs/event-logs',
-//     //     },
-//     //     {
-//     //       id: 'post-code-logs',
-//     //       label: i18n.global.t('appNavigation.postCodeLogs'),
-//     //       route: '/logs/post-code-logs',
-//     //     },
-//     //   ],
-//     // },
-//     // {
-//     //   id: 'hardware-status',
-//     //   label: i18n.global.t('appNavigation.hardwareStatus'),
-//     //   icon: iconDataCheck,
-//     //   children: [
-//     //     {
-//     //       id: 'inventory',
-//     //       label: i18n.global.t('appNavigation.inventory'),
-//     //       route: '/hardware-status/inventory',
-//     //     },
-//     //     {
-//     //       id: 'sensors',
-//     //       label: i18n.global.t('appNavigation.sensors'),
-//     //       route: '/hardware-status/sensors',
-//     //     },
-//     //   ],
-//     // },
-//     // {
-//     //   id: 'operations',
-//     //   label: i18n.global.t('appNavigation.operations'),
-//     //   icon: iconDataCheck,
-//     //   children: [
-//     //     {
-//     //       id: 'factory-reset',
-//     //       label: i18n.global.t('appNavigation.factoryReset'),
-//     //       route: '/operations/factory-reset',
-//     //     },
-//     //     {
-//     //       id: 'kvm',
-//     //       label: i18n.global.t('appNavigation.kvm'),
-//     //       route: '/operations/kvm',
-//     //     },
-//     //     {
-//     //       id: 'key-clear',
-//     //       label: i18n.global.t('appNavigation.keyClear'),
-//     //       route: '/operations/key-clear',
-//     //     },
-//     //     {
-//     //       id: 'firmware',
-//     //       label: i18n.global.t('appNavigation.firmware'),
-//     //       route: '/operations/firmware',
-//     //     },
-//     //     {
-//     //       id: 'reboot-bmc',
-//     //       label: i18n.global.t('appNavigation.rebootBmc'),
-//     //       route: '/operations/reboot-bmc',
-//     //     },
-//     //     {
-//     //       id: 'serial-over-lan',
-//     //       label: i18n.global.t('appNavigation.serialOverLan'),
-//     //       route: '/operations/serial-over-lan',
-//     //       exclusiveToRoles: [roles.administrator],
-//     //     },
-//     //     {
-//     //       id: 'server-power-operations',
-//     //       label: i18n.global.t('appNavigation.serverPowerOperations'),
-//     //       route: '/operations/server-power-operations',
-//     //     },
-//     //     {
-//     //       id: 'virtual-media',
-//     //       label: i18n.global.t('appNavigation.virtualMedia'),
-//     //       route: '/operations/virtual-media',
-//     //       exclusiveToRoles: [roles.administrator],
-//     //     },
-//     //   ],
-//     // },
-//     // {
-//     //   id: 'settings',
-//     //   label: i18n.global.t('appNavigation.settings'),
-//     //   icon: iconSettings,
-//     //   children: [
-//     //     {
-//     //       id: 'date-time',
-//     //       label: i18n.global.t('appNavigation.dateTime'),
-//     //       route: '/settings/date-time',
-//     //     },
-//     //     {
-//     //       id: 'network',
-//     //       label: i18n.global.t('appNavigation.network'),
-//     //       route: '/settings/network',
-//     //     },
-//     //     {
-//     //       id: 'power-restore-policy',
-//     //       label: i18n.global.t('appNavigation.powerRestorePolicy'),
-//     //       route: '/settings/power-restore-policy',
-//     //     },
-//     //     {
-//     //       id: 'snmp-alerts',
-//     //       label: i18n.global.t('appNavigation.snmpAlerts'),
-//     //       route: '/settings/snmp-alerts',
-//     //     },
-//     //   ],
-//     // },
-//     // // {
-//     // //   id: 'security-and-access',
-//     // //   label: i18n.global.t('appNavigation.securityAndAccess'),
-//     // //   icon: iconSecurity,
-//     // //   children: [
-//     // //     {
-//     // //       id: 'sessions',
-//     // //       label: i18n.global.t('appNavigation.sessions'),
-//     // //       route: '/security-and-access/sessions',
-//     // //     },
-//     // //     {
-//     // //       id: 'ldap',
-//     // //       label: i18n.global.t('appNavigation.ldap'),
-//     // //       route: '/security-and-access/ldap',
-//     // //     },
-//     // //     {
-//     // //       id: 'user-management',
-//     // //       label: i18n.global.t('appNavigation.userManagement'),
-//     // //       route: '/security-and-access/user-management',
-//     // //     },
-//     // //     {
-//     // //       id: 'policies',
-//     // //       label: i18n.global.t('appNavigation.policies'),
-//     // //       route: '/security-and-access/policies',
-//     // //     },
-//     // //     {
-//     // //       id: 'certificates',
-//     // //       label: i18n.global.t('appNavigation.certificates'),
-//     // //       route: '/security-and-access/certificates',
-//     // //     },
-//     // //   ],
-//     // // },
-//     // // {
-//     // //   id: 'resource-management',
-//     // //   label: i18n.global.t('appNavigation.resourceManagement'),
-//     // //   icon: iconDataBase,
-//     // //   children: [
-//     // //     {
-//     // //       id: 'power',
-//     // //       label: i18n.global.t('appNavigation.power'),
-//     // //       route: '/resource-management/power',
-//     // //     },
-//     // //   ],
-//     // // },
-
-//     {
-//       id: 'overview',
-//       label: i18n.global.t('appNavigation.overview'),
-//       route: '/',
-//       icon: IconDashboard,
-//     },
-//     {
-//       id: 'operations',
-//       label: i18n.global.t('appNavigation.operations'),
-//       icon: IconSettingsAdjust,
-//       children: [
-//         {
-//           id: 'server-power-operations',
-//           label: i18n.global.t('appNavigation.serverPowerOperations'),
-//           route: '/operations/server-power-operations',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'host-console',
-//           label: i18n.global.t('appNavigation.hostConsole'),
-//           route: '/operations/host-console',
-//           restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-//         },
-//         {
-//           id: 'service-login',
-//           label: i18n.global.t('appPageTitle.serviceLogin'),
-//           route: '/operations/service-login',
-//           restrictTo: ['OemIBMServiceAgent'],
-//         },
-//         {
-//           id: 'firmware',
-//           label: i18n.global.t('appNavigation.firmware'),
-//           route: '/operations/firmware',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'reboot-bmc',
-//           label: i18n.global.t('appNavigation.rebootBmc'),
-//           route: '/operations/reboot-bmc',
-//           restrictTo: [],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'resource-management',
-//       label: i18n.global.t('appNavigation.resourceManagement'),
-//       icon: IconDataBase,
-//       children: [
-//         {
-//           id: 'memory',
-//           label: i18n.global.t('appNavigation.memory'),
-//           route: '/resource-management/memory',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'power',
-//           label: i18n.global.t('appNavigation.power'),
-//           route: '/resource-management/power',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'capacity-on-demand',
-//           label: i18n.global.t('appNavigation.capacityOnDemand'),
-//           route: '/resource-management/capacity-on-demand',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'field-core-override',
-//           label: i18n.global.t('appNavigation.fieldCoreOverride'),
-//           route: '/resource-management/field-core-override',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'system-parameters',
-//           label: i18n.global.t('appNavigation.systemParameters'),
-//           route: '/resource-management/system-parameters',
-//           restrictTo: [],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'hardware-status',
-//       label: i18n.global.t('appNavigation.hardwareStatus'),
-//       icon: IconDataCheck,
-//       children: [
-//         {
-//           id: 'inventory',
-//           label: i18n.global.t('appNavigation.inventory'),
-//           route: '/hardware-status/inventory',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'sensors',
-//           label: i18n.global.t('appNavigation.sensors'),
-//           route: '/hardware-status/sensors',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'hardware-deconfiguration',
-//           label: i18n.global.t('appNavigation.deconfigurationHardware'),
-//           route: '/settings/hardware-deconfiguration',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'pcie-topology',
-//           label: i18n.global.t('appNavigation.pcieTopology'),
-//           route: '/hardware-status/pcie-topology',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'concurrent-maintenance',
-//           label: i18n.global.t('appNavigation.concurrentMaintenance'),
-//           route: '/hardware-status/concurrent-maintenance',
-//           restrictTo: ['Everest'],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'logs',
-//       label: i18n.global.t('appNavigation.logs'),
-//       icon: IconTextLinkAnalysis,
-//       children: [
-//         {
-//           id: 'post-code-logs',
-//           label: i18n.global.t('appNavigation.postCodeLogs'),
-//           route: '/logs/post-code-logs',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'event-logs',
-//           label: i18n.global.t('appNavigation.eventLogs'),
-//           route: '/logs/event-logs',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'audit-logs',
-//           label: i18n.global.t('appNavigation.auditLogs'),
-//           route: '/logs/audit-logs',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'dumps',
-//           label: i18n.global.t('appNavigation.dumps'),
-//           route: '/logs/dumps',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'ibmi-service-functions',
-//           label: i18n.global.t('appNavigation.ibmiServiceFunctions'),
-//           route: '/logs/ibmi-service-functions',
-//           restrictTo: ['NonHMCManaged'],
-//         },
-//         {
-//           id: 'deconfiguration-records',
-//           label: i18n.global.t('appNavigation.deconfigurationRecords'),
-//           route: '/logs/deconfiguration-records',
-//           restrictTo: [],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'settings',
-//       label: i18n.global.t('appNavigation.settings'),
-//       icon: IconSettings,
-//       children: [
-//         {
-//           id: 'date-time',
-//           label: i18n.global.t('appNavigation.dateTime'),
-//           route: '/settings/date-time',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'network',
-//           label: i18n.global.t('appNavigation.network'),
-//           route: '/settings/network',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'power-restore-policy',
-//           label: i18n.global.t('appNavigation.powerRestorePolicy'),
-//           route: '/settings/power-restore-policy',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'snmp-alerts',
-//           label: i18n.global.t('appNavigation.snmpAlerts'),
-//           route: '/settings/snmp-alerts',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'factory-reset',
-//           label: i18n.global.t('appNavigation.factoryReset'),
-//           route: '/operations/factory-reset',
-//           restrictTo: [],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'security-and-access',
-//       label: i18n.global.t('appNavigation.securityAndAccess'),
-//       icon: IconSecurity,
-//       children: [
-//         {
-//           id: 'sessions',
-//           label: i18n.global.t('appNavigation.sessions'),
-//           route: '/security-and-access/sessions',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'user-management',
-//           label: i18n.global.t('appNavigation.userManagement'),
-//           route: '/security-and-access/user-management',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'ldap',
-//           label: i18n.global.t('appNavigation.ldap'),
-//           route: '/security-and-access/ldap',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'certificates',
-//           label: i18n.global.t('appNavigation.certificates'),
-//           route: '/security-and-access/certificates',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'policies',
-//           label: i18n.global.t('appNavigation.policies'),
-//           route: '/security-and-access/policies',
-//           restrictTo: [],
-//         },
-//         {
-//           id: 'key-clear',
-//           label: i18n.global.t('appNavigation.keyClear'),
-//           route: '/operations/key-clear',
-//           restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-//         },
-//       ],
-//     },
-//     {
-//       id: 'notices',
-//       label: i18n.global.t('appNavigation.notices'),
-//       route: '/notices',
-//       icon: IconDocument,
-//     },
-//   ];
-//   return {
-//     navigationItems,
-//   };
-// }
-// export default AppNavigationMixin;
+import i18n from '@/i18n';
+import stores from '@/store'
 
 import { ref, computed, onMounted } from 'vue';
-// import { IconDashboard, IconTextLinkAnalysis, IconDataCheck, IconSettingsAdjust, IconSettings, IconSecurity, IconChevronUp, IconDataBase, IconDocument } from '@carbon/icons-vue/es';
 
-export default function AppNavigationData({ $store, i18n }) {
+const AppNavigationData = () => {
   const navigationData = ref([
-    {
-      id: 'overview',
-      label: i18n.global.t('appNavigation.overview'),
-      route: '/',
-      icon: IconDashboard,
-    },
-    {
-      id: 'operations',
-      label: i18n.global.t('appNavigation.operations'),
-      icon: IconSettingsAdjust,
-      children: [
         {
-          id: 'server-power-operations',
-          label: i18n.global.t('appNavigation.serverPowerOperations'),
-          route: '/operations/server-power-operations',
-          restrictTo: [],
+          id: 'overview',
+          label: i18n.global.t('appNavigation.overview'),
+          route: '/',
+          icon: IconDashboard,
+        },
+        {
+          id: 'operations',
+          label: i18n.global.t('appNavigation.operations'),
+          icon: IconSettingsAdjust,
+          children: [
+            {
+              id: 'server-power-operations',
+              label: i18n.global.t('appNavigation.serverPowerOperations'),
+              route: '/operations/server-power-operations',
+              restrictTo: [],
+            },
+            {
+              id: 'host-console',
+              label: i18n.global.t('appNavigation.hostConsole'),
+              route: '/operations/host-console',
+              restrictTo: ['Administrator', 'OemIBMServiceAgent'],
+            },
+            {
+              id: 'service-login',
+              label: i18n.global.t('appPageTitle.serviceLogin'),
+              route: '/operations/service-login',
+              restrictTo: ['OemIBMServiceAgent'],
+            },
+            {
+              id: 'firmware',
+              label: i18n.global.t('appNavigation.firmware'),
+              route: '/operations/firmware',
+              restrictTo: [],
+            },
+            {
+              id: 'reboot-bmc',
+              label: i18n.global.t('appNavigation.rebootBmc'),
+              route: '/operations/reboot-bmc',
+              restrictTo: [],
+            },
+          ],
+        },
+        {
+          id: 'resource-management',
+          label: i18n.global.t('appNavigation.resourceManagement'),
+          icon: IconDataBase,
+          children: [
+            {
+              id: 'memory',
+              label: i18n.global.t('appNavigation.memory'),
+              route: '/resource-management/memory',
+              restrictTo: [],
+            },
+            {
+              id: 'power',
+              label: i18n.global.t('appNavigation.power'),
+              route: '/resource-management/power',
+              restrictTo: [],
+            },
+            {
+              id: 'capacity-on-demand',
+              label: i18n.global.t('appNavigation.capacityOnDemand'),
+              route: '/resource-management/capacity-on-demand',
+              restrictTo: [],
+            },
+            {
+              id: 'field-core-override',
+              label: i18n.global.t('appNavigation.fieldCoreOverride'),
+              route: '/resource-management/field-core-override',
+              restrictTo: [],
+            },
+            {
+              id: 'system-parameters',
+              label: i18n.global.t('appNavigation.systemParameters'),
+              route: '/resource-management/system-parameters',
+              restrictTo: [],
+            },
+          ],
+        },
+        {
+          id: 'hardware-status',
+          label: i18n.global.t('appNavigation.hardwareStatus'),
+          icon: IconDataCheck,
+          children: [
+            {
+              id: 'inventory',
+              label: i18n.global.t('appNavigation.inventory'),
+              route: '/hardware-status/inventory',
+              restrictTo: [],
+            },
+            {
+              id: 'sensors',
+              label: i18n.global.t('appNavigation.sensors'),
+              route: '/hardware-status/sensors',
+              restrictTo: [],
+            },
+            {
+              id: 'hardware-deconfiguration',
+              label: i18n.global.t('appNavigation.deconfigurationHardware'),
+              route: '/settings/hardware-deconfiguration',
+              restrictTo: [],
+            },
+            {
+              id: 'pcie-topology',
+              label: i18n.global.t('appNavigation.pcieTopology'),
+              route: '/hardware-status/pcie-topology',
+              restrictTo: [],
+            },
+            {
+              id: 'concurrent-maintenance',
+              label: i18n.global.t('appNavigation.concurrentMaintenance'),
+              route: '/hardware-status/concurrent-maintenance',
+              restrictTo: ['Everest'],
+            },
+          ],
+        },
+        {
+          id: 'logs',
+          label: i18n.global.t('appNavigation.logs'),
+          icon: IconTextLinkAnalysis,
+          children: [
+            {
+              id: 'post-code-logs',
+              label: i18n.global.t('appNavigation.postCodeLogs'),
+              route: '/logs/post-code-logs',
+              restrictTo: [],
+            },
+            {
+              id: 'event-logs',
+              label: i18n.global.t('appNavigation.eventLogs'),
+              route: '/logs/event-logs',
+              restrictTo: [],
+            },
+            {
+              id: 'audit-logs',
+              label: i18n.global.t('appNavigation.auditLogs'),
+              route: '/logs/audit-logs',
+              restrictTo: [],
+            },
+            {
+              id: 'dumps',
+              label: i18n.global.t('appNavigation.dumps'),
+              route: '/logs/dumps',
+              restrictTo: [],
+            },
+            {
+              id: 'ibmi-service-functions',
+              label: i18n.global.t('appNavigation.ibmiServiceFunctions'),
+              route: '/logs/ibmi-service-functions',
+              restrictTo: ['NonHMCManaged'],
+            },
+            {
+              id: 'deconfiguration-records',
+              label: i18n.global.t('appNavigation.deconfigurationRecords'),
+              route: '/logs/deconfiguration-records',
+              restrictTo: [],
+            },
+          ],
+        },
+        {
+          id: 'settings',
+          label: i18n.global.t('appNavigation.settings'),
+          icon: IconSettings,
+          children: [
+            {
+              id: 'date-time',
+              label: i18n.global.t('appNavigation.dateTime'),
+              route: '/settings/date-time',
+              restrictTo: [],
+            },
+            {
+              id: 'network',
+              label: i18n.global.t('appNavigation.network'),
+              route: '/settings/network',
+              restrictTo: [],
+            },
+            {
+              id: 'power-restore-policy',
+              label: i18n.global.t('appNavigation.powerRestorePolicy'),
+              route: '/settings/power-restore-policy',
+              restrictTo: [],
+            },
+            {
+              id: 'snmp-alerts',
+              label: i18n.global.t('appNavigation.snmpAlerts'),
+              route: '/settings/snmp-alerts',
+              restrictTo: [],
+            },
+            {
+              id: 'factory-reset',
+              label: i18n.global.t('appNavigation.factoryReset'),
+              route: '/operations/factory-reset',
+              restrictTo: [],
+            },
+          ],
+        },
+        {
+          id: 'security-and-access',
+          label: i18n.global.t('appNavigation.securityAndAccess'),
+          icon: IconSecurity,
+          children: [
+            {
+              id: 'sessions',
+              label: i18n.global.t('appNavigation.sessions'),
+              route: '/security-and-access/sessions',
+              restrictTo: [],
+            },
+            {
+              id: 'user-management',
+              label: i18n.global.t('appNavigation.userManagement'),
+              route: '/security-and-access/user-management',
+              restrictTo: [],
+            },
+            {
+              id: 'ldap',
+              label: i18n.global.t('appNavigation.ldap'),
+              route: '/security-and-access/ldap',
+              restrictTo: [],
+            },
+            {
+              id: 'certificates',
+              label: i18n.global.t('appNavigation.certificates'),
+              route: '/security-and-access/certificates',
+              restrictTo: [],
+            },
+            {
+              id: 'policies',
+              label: i18n.global.t('appNavigation.policies'),
+              route: '/security-and-access/policies',
+              restrictTo: [],
+            },
+            {
+              id: 'key-clear',
+              label: i18n.global.t('appNavigation.keyClear'),
+              route: '/operations/key-clear',
+              restrictTo: ['Administrator', 'OemIBMServiceAgent'],
+            },
+          ],
+        },
+        {
+          id: 'notices',
+          label: i18n.global.t('appNavigation.notices'),
+          route: '/notices',
+          icon: IconDocument,
         },
-        {
-          id: 'host-console',
-          label: i18n.global.t('appNavigation.hostConsole'),
-          route: '/operations/host-console',
-          restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-        },
-        {
-          id: 'service-login',
-          label: i18n.global.t('appPageTitle.serviceLogin'),
-          route: '/operations/service-login',
-          restrictTo: ['OemIBMServiceAgent'],
-        },
-        {
-          id: 'firmware',
-          label: i18n.global.t('appNavigation.firmware'),
-          route: '/operations/firmware',
-          restrictTo: [],
-        },
-        {
-          id: 'reboot-bmc',
-          label: i18n.global.t('appNavigation.rebootBmc'),
-          route: '/operations/reboot-bmc',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'resource-management',
-      label: i18n.global.t('appNavigation.resourceManagement'),
-      icon: IconDataBase,
-      children: [
-        {
-          id: 'memory',
-          label: i18n.global.t('appNavigation.memory'),
-          route: '/resource-management/memory',
-          restrictTo: [],
-        },
-        {
-          id: 'power',
-          label: i18n.global.t('appNavigation.power'),
-          route: '/resource-management/power',
-          restrictTo: [],
-        },
-        {
-          id: 'capacity-on-demand',
-          label: i18n.global.t('appNavigation.capacityOnDemand'),
-          route: '/resource-management/capacity-on-demand',
-          restrictTo: [],
-        },
-        {
-          id: 'field-core-override',
-          label: i18n.global.t('appNavigation.fieldCoreOverride'),
-          route: '/resource-management/field-core-override',
-          restrictTo: [],
-        },
-        {
-          id: 'system-parameters',
-          label: i18n.global.t('appNavigation.systemParameters'),
-          route: '/resource-management/system-parameters',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'hardware-status',
-      label: i18n.global.t('appNavigation.hardwareStatus'),
-      icon: IconDataCheck,
-      children: [
-        {
-          id: 'inventory',
-          label: i18n.global.t('appNavigation.inventory'),
-          route: '/hardware-status/inventory',
-          restrictTo: [],
-        },
-        {
-          id: 'sensors',
-          label: i18n.global.t('appNavigation.sensors'),
-          route: '/hardware-status/sensors',
-          restrictTo: [],
-        },
-        {
-          id: 'hardware-deconfiguration',
-          label: i18n.global.t('appNavigation.deconfigurationHardware'),
-          route: '/settings/hardware-deconfiguration',
-          restrictTo: [],
-        },
-        {
-          id: 'pcie-topology',
-          label: i18n.global.t('appNavigation.pcieTopology'),
-          route: '/hardware-status/pcie-topology',
-          restrictTo: [],
-        },
-        {
-          id: 'concurrent-maintenance',
-          label: i18n.global.t('appNavigation.concurrentMaintenance'),
-          route: '/hardware-status/concurrent-maintenance',
-          restrictTo: ['Everest'],
-        },
-      ],
-    },
-    {
-      id: 'logs',
-      label: i18n.global.t('appNavigation.logs'),
-      icon: IconTextLinkAnalysis,
-      children: [
-        {
-          id: 'post-code-logs',
-          label: i18n.global.t('appNavigation.postCodeLogs'),
-          route: '/logs/post-code-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'event-logs',
-          label: i18n.global.t('appNavigation.eventLogs'),
-          route: '/logs/event-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'audit-logs',
-          label: i18n.global.t('appNavigation.auditLogs'),
-          route: '/logs/audit-logs',
-          restrictTo: [],
-        },
-        {
-          id: 'dumps',
-          label: i18n.global.t('appNavigation.dumps'),
-          route: '/logs/dumps',
-          restrictTo: [],
-        },
-        {
-          id: 'ibmi-service-functions',
-          label: i18n.global.t('appNavigation.ibmiServiceFunctions'),
-          route: '/logs/ibmi-service-functions',
-          restrictTo: ['NonHMCManaged'],
-        },
-        {
-          id: 'deconfiguration-records',
-          label: i18n.global.t('appNavigation.deconfigurationRecords'),
-          route: '/logs/deconfiguration-records',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'settings',
-      label: i18n.global.t('appNavigation.settings'),
-      icon: IconSettings,
-      children: [
-        {
-          id: 'date-time',
-          label: i18n.global.t('appNavigation.dateTime'),
-          route: '/settings/date-time',
-          restrictTo: [],
-        },
-        {
-          id: 'network',
-          label: i18n.global.t('appNavigation.network'),
-          route: '/settings/network',
-          restrictTo: [],
-        },
-        {
-          id: 'power-restore-policy',
-          label: i18n.global.t('appNavigation.powerRestorePolicy'),
-          route: '/settings/power-restore-policy',
-          restrictTo: [],
-        },
-        {
-          id: 'snmp-alerts',
-          label: i18n.global.t('appNavigation.snmpAlerts'),
-          route: '/settings/snmp-alerts',
-          restrictTo: [],
-        },
-        {
-          id: 'factory-reset',
-          label: i18n.global.t('appNavigation.factoryReset'),
-          route: '/operations/factory-reset',
-          restrictTo: [],
-        },
-      ],
-    },
-    {
-      id: 'security-and-access',
-      label: i18n.global.t('appNavigation.securityAndAccess'),
-      icon: IconSecurity,
-      children: [
-        {
-          id: 'sessions',
-          label: i18n.global.t('appNavigation.sessions'),
-          route: '/security-and-access/sessions',
-          restrictTo: [],
-        },
-        {
-          id: 'user-management',
-          label: i18n.global.t('appNavigation.userManagement'),
-          route: '/security-and-access/user-management',
-          restrictTo: [],
-        },
-        {
-          id: 'ldap',
-          label: i18n.global.t('appNavigation.ldap'),
-          route: '/security-and-access/ldap',
-          restrictTo: [],
-        },
-        {
-          id: 'certificates',
-          label: i18n.global.t('appNavigation.certificates'),
-          route: '/security-and-access/certificates',
-          restrictTo: [],
-        },
-        {
-          id: 'policies',
-          label: i18n.global.t('appNavigation.policies'),
-          route: '/security-and-access/policies',
-          restrictTo: [],
-        },
-        {
-          id: 'key-clear',
-          label: i18n.global.t('appNavigation.keyClear'),
-          route: '/operations/key-clear',
-          restrictTo: ['Administrator', 'OemIBMServiceAgent'],
-        },
-      ],
-    },
-    {
-      id: 'notices',
-      label: i18n.global.t('appNavigation.notices'),
-      route: '/notices',
-      icon: IconDocument,
-    },
-    // Other navigation data...
   ]);
-
+  
+  const globalStore = stores.GlobalStore();
   const roleId = computed(
-    () => $store?.getters?.['global/currentUser']?.RoleId,
+    () => globalStore.currentUserGetter?.RoleId,
   );
-  const systemInfo = computed(() => $store?.getters['global/modelType']);
-  const hmcInfo = computed(() => $store?.getters['global/hmcManaged']);
+  const systemInfo = computed(() => globalStore.modelTypeGetter);
+  const hmcInfo = computed(() => globalStore.hmcManagedGetter);
 
   const model = computed(() =>
     systemInfo.value?.startsWith('9043') ? 'Everest' : 'NotEverest',
@@ -1041,7 +300,7 @@ export default function AppNavigationData({ $store, i18n }) {
   });
 
   onMounted(() => {
-    $store.dispatch('global/getHmcManaged');
+    globalStore.getHmcManaged();
   });
 
   return {
@@ -1052,3 +311,4 @@ export default function AppNavigationData({ $store, i18n }) {
     isHmcManged,
   };
 }
+export default AppNavigationData;
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index e3b25f8480..840cec4eed 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -1,4 +1,3 @@
-// TODO: Work Requird -->
 import AppLayout from '@/layouts/AppLayout.vue';
 import AuditLogs from '@/views/Logs/AuditLogs';
 import ChangePassword from '@/views/ChangePassword';
@@ -58,7 +57,7 @@ const routes = [
         name: 'login',
         component: Login,
         meta: {
-          title: i18n.t('appPageTitle.login'),
+          title: i18n.global.t('appPageTitle.login'),
         },
       },
       {
@@ -66,7 +65,7 @@ const routes = [
         name: 'change-password',
         component: ChangePassword,
         meta: {
-          title: i18n.t('appPageTitle.changePassword'),
+          title: i18n.global.t('appPageTitle.changePassword'),
           requiresAuth: true,
         },
       },
@@ -84,7 +83,7 @@ const routes = [
         name: 'service-login-consoles',
         component: ServiceLoginConsoles,
         meta: {
-          title: i18n.t('appPageTitle.serviceLogin'),
+          title: i18n.global.t('appPageTitle.serviceLogin'),
         },
       },
       {
@@ -92,7 +91,7 @@ const routes = [
         name: 'host-console-console',
         component: HostConsoleConsole,
         meta: {
-          title: i18n.t('appPageTitle.hostConsole'),
+          title: i18n.global.t('appPageTitle.hostConsole'),
         },
       },
       {
@@ -100,7 +99,7 @@ const routes = [
         name: 'post-codes',
         component: PostCodes,
         meta: {
-          title: i18n.t('appPageTitle.postCodes'),
+          title: i18n.global.t('appPageTitle.postCodes'),
         },
       },
     ],
@@ -117,7 +116,7 @@ const routes = [
         name: 'overview',
         component: Overview,
         meta: {
-          title: i18n.t('appPageTitle.overview'),
+          title: i18n.global.t('appPageTitle.overview'),
         },
       },
       {
@@ -125,7 +124,7 @@ const routes = [
         name: 'notices',
         component: Notices,
         meta: {
-          title: i18n.t('appPageTitle.notices'),
+          title: i18n.global.t('appPageTitle.notices'),
         },
       },
       {
@@ -133,7 +132,7 @@ const routes = [
         name: 'profile-settings',
         component: ProfileSettings,
         meta: {
-          title: i18n.t('appPageTitle.profileSettings'),
+          title: i18n.global.t('appPageTitle.profileSettings'),
         },
       },
       {
@@ -141,7 +140,7 @@ const routes = [
         name: 'deconfiguration-records',
         component: DeconfigurationRecords,
         meta: {
-          title: i18n.t('appPageTitle.deconfigurationRecords'),
+          title: i18n.global.t('appPageTitle.deconfigurationRecords'),
         },
       },
       {
@@ -149,7 +148,7 @@ const routes = [
         name: 'dumps',
         component: Dumps,
         meta: {
-          title: i18n.t('appPageTitle.dumps'),
+          title: i18n.global.t('appPageTitle.dumps'),
         },
       },
       {
@@ -157,7 +156,7 @@ const routes = [
         name: 'ibmiServiceFunctions',
         component: IBMiServiceFunctions,
         meta: {
-          title: i18n.t('appPageTitle.ibmiServiceFunctions'),
+          title: i18n.global.t('appPageTitle.ibmiServiceFunctions'),
         },
       },
       {
@@ -165,7 +164,7 @@ const routes = [
         name: 'event-logs',
         component: EventLogs,
         meta: {
-          title: i18n.t('appPageTitle.eventLogs'),
+          title: i18n.global.t('appPageTitle.eventLogs'),
         },
       },
       {
@@ -173,7 +172,7 @@ const routes = [
         name: 'audit-logs',
         component: AuditLogs,
         meta: {
-          title: i18n.t('appPageTitle.auditLogs'),
+          title: i18n.global.t('appPageTitle.auditLogs'),
         },
       },
       {
@@ -181,7 +180,7 @@ const routes = [
         name: 'post-code-logs',
         component: PostCodeLogs,
         meta: {
-          title: i18n.t('appPageTitle.postCodeLogs'),
+          title: i18n.global.t('appPageTitle.postCodeLogs'),
         },
       },
       {
@@ -189,7 +188,7 @@ const routes = [
         name: 'inventory',
         component: Inventory,
         meta: {
-          title: i18n.t('appPageTitle.inventory'),
+          title: i18n.global.t('appPageTitle.inventory'),
         },
       },
       {
@@ -197,7 +196,7 @@ const routes = [
         name: 'sensors',
         component: Sensors,
         meta: {
-          title: i18n.t('appPageTitle.sensors'),
+          title: i18n.global.t('appPageTitle.sensors'),
         },
       },
       {
@@ -205,7 +204,7 @@ const routes = [
         name: 'pcie-topology',
         component: PcieTopology,
         meta: {
-          title: i18n.t('appPageTitle.pcieTopology'),
+          title: i18n.global.t('appPageTitle.pcieTopology'),
         },
       },
       {
@@ -213,7 +212,7 @@ const routes = [
         name: 'concurrent-maintenance',
         component: ConcurrentMaintenance,
         meta: {
-          title: i18n.t('appPageTitle.concurrentMaintenance'),
+          title: i18n.global.t('appPageTitle.concurrentMaintenance'),
         },
       },
       {
@@ -221,7 +220,7 @@ const routes = [
         name: 'sessions',
         component: Sessions,
         meta: {
-          title: i18n.t('appPageTitle.sessions'),
+          title: i18n.global.t('appPageTitle.sessions'),
         },
       },
       {
@@ -229,7 +228,7 @@ const routes = [
         name: 'ldap',
         component: Ldap,
         meta: {
-          title: i18n.t('appPageTitle.ldap'),
+          title: i18n.global.t('appPageTitle.ldap'),
         },
       },
       {
@@ -237,7 +236,7 @@ const routes = [
         name: 'user-management',
         component: UserManagement,
         meta: {
-          title: i18n.t('appPageTitle.userManagement'),
+          title: i18n.global.t('appPageTitle.userManagement'),
         },
       },
       {
@@ -245,7 +244,7 @@ const routes = [
         name: 'policies',
         component: Policies,
         meta: {
-          title: i18n.t('appPageTitle.policies'),
+          title: i18n.global.t('appPageTitle.policies'),
         },
       },
       {
@@ -253,7 +252,7 @@ const routes = [
         name: 'certificates',
         component: Certificates,
         meta: {
-          title: i18n.t('appPageTitle.certificates'),
+          title: i18n.global.t('appPageTitle.certificates'),
         },
       },
       {
@@ -261,7 +260,7 @@ const routes = [
         name: 'date-time',
         component: DateTime,
         meta: {
-          title: i18n.t('appPageTitle.dateTime'),
+          title: i18n.global.t('appPageTitle.dateTime'),
         },
       },
       {
@@ -269,7 +268,7 @@ const routes = [
         name: 'firmware',
         component: Firmware,
         meta: {
-          title: i18n.t('appPageTitle.firmware'),
+          title: i18n.global.t('appPageTitle.firmware'),
         },
       },
       {
@@ -277,7 +276,7 @@ const routes = [
         name: 'hardware-deconfiguration',
         component: HardwareDeconfiguration,
         meta: {
-          title: i18n.t('appPageTitle.deconfigurationHardware'),
+          title: i18n.global.t('appPageTitle.deconfigurationHardware'),
         },
       },
       {
@@ -285,7 +284,7 @@ const routes = [
         name: 'network',
         component: Network,
         meta: {
-          title: i18n.t('appPageTitle.network'),
+          title: i18n.global.t('appPageTitle.network'),
         },
       },
       {
@@ -293,7 +292,7 @@ const routes = [
         name: 'power-restore-policy',
         component: PowerRestorePolicy,
         meta: {
-          title: i18n.t('appPageTitle.powerRestorePolicy'),
+          title: i18n.global.t('appPageTitle.powerRestorePolicy'),
         },
       },
       {
@@ -301,7 +300,7 @@ const routes = [
         name: 'snmp-alerts',
         component: SnmpAlerts,
         meta: {
-          title: i18n.t('appPageTitle.snmpAlerts'),
+          title: i18n.global.t('appPageTitle.snmpAlerts'),
         },
       },
       {
@@ -309,7 +308,7 @@ const routes = [
         name: 'system-parameters',
         component: SystemParameters,
         meta: {
-          title: i18n.t('appPageTitle.systemParameters'),
+          title: i18n.global.t('appPageTitle.systemParameters'),
         },
       },
       {
@@ -317,7 +316,7 @@ const routes = [
         name: 'memory',
         component: Memory,
         meta: {
-          title: i18n.t('appPageTitle.memory'),
+          title: i18n.global.t('appPageTitle.memory'),
         },
       },
       {
@@ -325,7 +324,7 @@ const routes = [
         name: 'power',
         component: Power,
         meta: {
-          title: i18n.t('appPageTitle.power'),
+          title: i18n.global.t('appPageTitle.power'),
         },
       },
       {
@@ -333,7 +332,7 @@ const routes = [
         name: 'capacity-on-demand',
         component: CapacityOnDemand,
         meta: {
-          title: i18n.t('appPageTitle.capacityOnDemand'),
+          title: i18n.global.t('appPageTitle.capacityOnDemand'),
         },
       },
       {
@@ -341,7 +340,7 @@ const routes = [
         name: 'field-core-override',
         component: FieldCoreOverride,
         meta: {
-          title: i18n.t('appPageTitle.fieldCoreOverride'),
+          title: i18n.global.t('appPageTitle.fieldCoreOverride'),
         },
       },
       {
@@ -349,7 +348,7 @@ const routes = [
         name: 'factory-reset',
         component: FactoryReset,
         meta: {
-          title: i18n.t('appPageTitle.factoryReset'),
+          title: i18n.global.t('appPageTitle.factoryReset'),
         },
       },
       {
@@ -357,7 +356,7 @@ const routes = [
         name: 'key-clear',
         component: KeyClear,
         meta: {
-          title: i18n.t('appPageTitle.keyClear'),
+          title: i18n.global.t('appPageTitle.keyClear'),
         },
       },
       {
@@ -365,7 +364,7 @@ const routes = [
         name: 'reboot-bmc',
         component: RebootBmc,
         meta: {
-          title: i18n.t('appPageTitle.rebootBmc'),
+          title: i18n.global.t('appPageTitle.rebootBmc'),
         },
       },
       {
@@ -373,7 +372,7 @@ const routes = [
         name: 'service-login',
         component: ServiceLogin,
         meta: {
-          title: i18n.t('appPageTitle.serviceLogin'),
+          title: i18n.global.t('appPageTitle.serviceLogin'),
         },
       },
       {
@@ -381,7 +380,7 @@ const routes = [
         name: 'host-console',
         component: HostConsole,
         meta: {
-          title: i18n.t('appPageTitle.hostConsole'),
+          title: i18n.global.t('appPageTitle.hostConsole'),
         },
       },
       {
@@ -389,7 +388,7 @@ const routes = [
         name: 'server-power-operations',
         component: ServerPowerOperations,
         meta: {
-          title: i18n.t('appPageTitle.serverPowerOperations'),
+          title: i18n.global.t('appPageTitle.serverPowerOperations'),
         },
       },
       {
@@ -397,7 +396,7 @@ const routes = [
         name: 'page-not-found',
         component: PageNotFound,
         meta: {
-          title: i18n.t('appPageTitle.pageNotFound'),
+          title: i18n.global.t('appPageTitle.pageNotFound'),
         },
       },
     ],
diff --git a/src/env/store/ibm.js b/src/env/store/ibm.js
index 1fcc77c93f..9cd1493844 100644
--- a/src/env/store/ibm.js
+++ b/src/env/store/ibm.js
@@ -1,16 +1,21 @@
-//TODO: Work Requird -->
-import store from '@/store';
-import DumpsStore from '@/store/modules/Logs/DumpsStore';
-import KeyClearStore from '@/store/modules/Operations/KeyClearStore';
-import LicenseStore from '@/store/modules/ResourceManagement/LicenseStore';
-import FieldCoreOverrideStore from '@/store/modules/ResourceManagement/FieldCoreOverrideStore';
+import stores from '@/store';
+import DumpsStore from '../../store/modules/Logs/DumpsStore.js';
+import KeyClearStore from '../../store/modules/Operations/KeyClearStore';
+import LicenseStore from '../../store/modules/ResourceManagement/LicenseStore';
+import FieldCoreOverrideStore from '../../store/modules/ResourceManagement/FieldCoreOverrideStore.js';
 
-store.unregisterModule('virtualMedia');
+  Object.assign(stores, {
+    DumpsStore: DumpsStore,
+  });
+  Object.assign(stores, {
+    KeyClearStore: KeyClearStore,
+  });
+  Object.assign(stores, {
+    LicenseStore: LicenseStore,
+  });
+  Object.assign(stores, {
+    FieldCoreOverrideStore: FieldCoreOverrideStore,
+  });
 
-store.registerModule('dumps', DumpsStore);
-store.registerModule('licenses', LicenseStore);
-store.registerModule('fieldCoreOverride', FieldCoreOverrideStore);
+  export default stores;
 
-store.registerModule('key-clear', KeyClearStore);
-
-export default store;
diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
index 272044e513..dd83bb49c1 100644
--- a/src/layouts/AppLayout.vue
+++ b/src/layouts/AppLayout.vue
@@ -22,13 +22,13 @@ import AppNavigation from '@/components/AppNavigation/AppNavigation.vue';
 import PageContainer from '@/components/Global/PageContainer.vue';
 import ButtonBackToTop from '@/components/Global/ButtonBackToTop.vue';
 import useJumpLinkComposable from '@/components/Composables/useJumpLinkComposable';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 import { useRoute } from 'vue-router';
 import eventBus from '@/eventBus';
 
 const { setFocus } = useJumpLinkComposable();
 
-const global = GlobalStore();
+const global = stores.GlobalStore();
 
 const route = useRoute();
 
diff --git a/src/main.js b/src/main.js
index 2f8520c7e7..274f85f111 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@ import { createPinia } from 'pinia';
 import App from './App.vue';
 import router from './router';
 import { createBootstrap } from 'bootstrap-vue-next';
-import { GlobalStore, AuthenticationStore } from './store';
+import stores from './store';
 import { format } from 'date-fns-tz';
 // Add the necessary CSSs
 // import 'bootstrap/dist/css/bootstrap.css';
@@ -25,8 +25,8 @@ app.use(i18n);
 
 pinia.use(WebSocketPlugin);
 
-const globalStore = GlobalStore();
-const authenticationStore = AuthenticationStore();
+const globalStore = stores.GlobalStore();
+const authenticationStore = stores.AuthenticationStore();
 
 if (authenticationStore.isLoggedIn) initWebSocket();
 
diff --git a/src/router/index.js b/src/router/index.js
index 30b693651a..c992eb519a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
 import routes from './routes';
-import { GlobalStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 
 const router = createRouter({
   history: createWebHashHistory(),
@@ -9,7 +9,7 @@ const router = createRouter({
 });
 
 function allowRouterToNavigate(to, next, currentUserRole) {
-  const authenticationStore = AuthenticationStore();
+  const authenticationStore = stores.AuthenticationStore();
   if (to.matched.some((record) => record.meta.requiresAuth)) {
     if (authenticationStore.isLoggedIn) {
       if (to.meta.exclusiveToRoles) {
@@ -32,8 +32,8 @@ function allowRouterToNavigate(to, next, currentUserRole) {
 }
 
 router.beforeEach((to, from, next) => {
-  const globalStore = GlobalStore();
-  const authenticationStore = AuthenticationStore();
+  const globalStore = stores.GlobalStore();
+  const authenticationStore = stores.AuthenticationStore();
   let currentUserRole = globalStore.userPrivilege;
   // condition will get satisfied if user refreshed after login
   if (!currentUserRole && authenticationStore.isLoggedIn) {
diff --git a/src/router/routes.js b/src/router/routes.js
index ba87d69742..716acab388 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,59 +1,44 @@
-//TODO: Work Requird -->
-
-import i18n from '@/i18n';
-import LoginLayout from '@/layouts/LoginLayout.vue';
-import LoginPage from '@/views/Login/Login.vue';
 import AppLayout from '@/layouts/AppLayout.vue';
-import Overview from '@/views/Overview/Overview.vue';
-import VirtualMedia from '@/views/Operations/VirtualMedia/VirtualMedia.vue';
-import Kvm from '@/views/Operations/Kvm';
-import Policies from '@/views/SecurityAndAccess/Policies';
-import Sensors from '@/views/HardwareStatus/Sensors';
 import AuditLogs from '@/views/Logs/AuditLogs';
-import PageNotFound from '@/views/PageNotFound/PageNotFound.vue';
-import KeyClear from '@/views/Operations/KeyClear/KeyClear.vue';
-import RebootBmc from '@/views/Operations/RebootBmc';
+import ChangePassword from '@/views/ChangePassword';
+import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
+import ConcurrentMaintenance from '../views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue';
+import DateTime from '@/views/Settings/DateTime/DateTime.vue';
+import EventLogs from '@/views/Logs/EventLogs';
 import FactoryReset from '@/views/Operations/FactoryReset';
-import Memory from '@/views/ResourceManagement/Memory';
+import Firmware from '@/views/Operations/Firmware';
+import Inventory from '../views/HardwareStatus/Inventory/Inventory.vue';
+import Kvm from '@/views/Operations/Kvm';
+import KvmConsole from '@/views/Operations/Kvm/KvmConsole';
+import Sessions from '@/views/SecurityAndAccess/Sessions';
+import Ldap from '../views/SecurityAndAccess/Ldap/Ldap.vue';
+import UserManagement from '@/views/SecurityAndAccess/UserManagement';
+import LoginPage from '@/views/Login/Login.vue';
+import LoginLayout from '@/layouts/LoginLayout.vue';
+import HardwareDeconfiguration from '../views/Settings/HardwareDeconfiguration/HardwareDeconfiguration.vue';
+import Network from '@/views/Settings/Network';
+import Overview from '@/views/Overview/Overview.vue';
+import PageNotFound from '@/views/PageNotFound/PageNotFound.vue';
 import PostCodes from '@/views/Logs/PostCodeLogs/PostCodes.vue';
 import PostCodeLogs from '@/views/Logs/PostCodeLogs/PostCodeLogs.vue';
-import Power from '@/views/ResourceManagement/Power';
 import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy';
-import ConcurrentMaintenance from '../views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue';
+import ProfileSettings from '@/views/ProfileSettings';
+import RebootBmc from '@/views/Operations/RebootBmc';
+import Policies from '@/views/SecurityAndAccess/Policies';
+import KeyClear from '@/views/Operations/KeyClear/KeyClear.vue';
 import PcieTopology from '../views/HardwareStatus/PcieTopology/PcieTopology.vue';
-import IBMiServiceFunctions from '@/views/Logs/IBMiServiceFunctions';
-import Notices from '@/views/Notices/Notices.vue';
-import Sessions from '@/views/SecurityAndAccess/Sessions';
-import UserManagement from '@/views/SecurityAndAccess/UserManagement';
-import Firmware from '@/views/Operations/Firmware';
-import Certificates from '@/views/SecurityAndAccess/Certificates';
-import Inventory from '../views/HardwareStatus/Inventory/Inventory.vue';
-import SystemParameters from '@/views/ResourceManagement/SystemParameters';
-import HardwareDeconfiguration from '../views/Settings/HardwareDeconfiguration/HardwareDeconfiguration.vue';
+import Sensors from '@/views/HardwareStatus/Sensors';
 import HostConsole from '@/views/Operations/HostConsole';
 import HostConsoleConsole from '@/views/Operations/HostConsole/HostConsoleConsole.vue';
-import CapacityOnDemand from '../views/ResourceManagement/CapacityOnDemand/CapacityOnDemand.vue';
-import DeconfigurationRecords from '../views/Logs/DeconfigurationRecords/DeconfigurationRecords.vue';
 import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
-import Ldap from '../views/SecurityAndAccess/Ldap/Ldap.vue';
-import EventLogs from '@/views/Logs/EventLogs';
-import FieldCoreOverride from '@/views/ResourceManagement/FieldCoreOverride';
-import ServiceLoginConsoles from '@/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles.vue';
-import ServiceLogin from '@/views/Operations/ServiceLoginConsoles';
-import ProfileSettings from '@/views/ProfileSettings';
-import Network from '@/views/Settings/Network';
-import Dumps from '@/views/Logs/Dumps';
-import DateTime from '@/views/Settings/DateTime/DateTime.vue';
-import ChangePassword from '@/views/ChangePassword';
+import Certificates from '@/views/SecurityAndAccess/Certificates';
+import VirtualMedia from '@/views/Operations/VirtualMedia/VirtualMedia.vue';
+import Memory from '@/views/ResourceManagement/Memory';
+import Power from '@/views/ResourceManagement/Power';
+import SystemParameters from '@/views/ResourceManagement/SystemParameters';
 import SnmpAlerts from '@/views/Settings/SnmpAlerts';
-import ConsoleLayout from '@/layouts/ConsoleLayout.vue';
+import i18n from '@/i18n';
 
-const roles = {
-  administrator: 'Administrator',
-  operator: 'Operator',
-  readonly: 'ReadOnly',
-  noaccess: 'NoAccess',
-};
 export const routes = [
   {
     path: '/login',
@@ -63,6 +48,9 @@ export const routes = [
         path: '',
         name: 'LoginPage',
         component: LoginPage,
+        meta: {
+          title: i18n.t('appPageTitle.login'),
+        },
       },
       {
         path: '/change-password',
@@ -82,14 +70,6 @@ export const routes = [
       requiresAuth: true,
     },
     children: [
-      {
-        path: 'service-login-consoles',
-        name: 'service-login-consoles',
-        component: ServiceLoginConsoles,
-        meta: {
-          title: i18n.global.t('appPageTitle.serviceLogin'),
-        },
-      },
       {
         path: 'host-console-console',
         name: 'host-console-console',
@@ -105,6 +85,14 @@ export const routes = [
         meta: {
           title: i18n.global.t('appPageTitle.postCodes'),
         },
+      },
+            {
+        path: 'kvm',
+        name: 'kvm-console',
+        component: KvmConsole,
+        meta: {
+          title: i18n.global.t('appPageTitle.kvm'),
+        },
       },
     ],
   },
@@ -132,60 +120,27 @@ export const routes = [
         },
       },
       {
-        path: '/operations/virtual-media',
-        name: 'virtual-media',
-        component: VirtualMedia,
-        meta: {
-          title: i18n.global.t('appPageTitle.virtualMedia'),
-          exclusiveToRoles: [roles.administrator],
-        },
-      },
-      {
-        path: '/operations/server-power-operations',
-        name: 'server-power-operations',
-        component: ServerPowerOperations,
-        meta: {
-          title: i18n.global.t('appPageTitle.serverPowerOperations'),
-        },
-      },
-      {
-        path: '/operations/service-login',
-        name: 'service-login',
-        component: ServiceLogin,
-        meta: {
-          title: i18n.global.t('appPageTitle.serviceLogin'),
-        },
-      },
-      {
-        path: '/hardware-status/sensors',
-        name: 'sensors',
-        component: Sensors,
-        meta: {
-          title: i18n.global.t('appPageTitle.sensors'),
-        },
-      },
-      {
-        path: '/hardware-status/concurrent-maintenance',
-        name: 'concurrent-maintenance',
-        component: ConcurrentMaintenance,
+        path: '/logs/event-logs',
+        name: 'event-logs',
+        component: EventLogs,
         meta: {
-          title: i18n.global.t('appPageTitle.concurrentMaintenance'),
+          title: i18n.global.t('appPageTitle.eventLogs'),
         },
       },
       {
-        path: '/hardware-status/inventory',
-        name: 'inventory',
-        component: Inventory,
+        path: '/logs/audit-logs',
+        name: 'audit-logs',
+        component: AuditLogs,
         meta: {
-          title: i18n.global.t('appPageTitle.inventory'),
+          title: i18n.global.t('appPageTitle.auditLogs'),
         },
       },
       {
-        path: '/hardware-status/pcie-topology',
-        name: 'pcie-topology',
-        component: PcieTopology,
+        path: '/logs/post-code-logs',
+        name: 'post-code-logs',
+        component: PostCodeLogs,
         meta: {
-          title: i18n.global.t('appPageTitle.pcieTopology'),
+          title: i18n.global.t('appPageTitle.postCodeLogs'),
         },
       },
       {
@@ -197,51 +152,51 @@ export const routes = [
         },
       },
       {
-        path: '/logs/ibmi-service-functions',
-        name: 'ibmiServiceFunctions',
-        component: IBMiServiceFunctions,
+        path: '/hardware-status/sensors',
+        name: 'sensors',
+        component: Sensors,
         meta: {
-          title: i18n.global.t('appPageTitle.ibmiServiceFunctions'),
+          title: i18n.global.t('appPageTitle.sensors'),
         },
       },
       {
-        path: '/logs/event-logs',
-        name: 'event-logs',
-        component: EventLogs,
+        path: '/hardware-status/pcie-topology',
+        name: 'pcie-topology',
+        component: PcieTopology,
         meta: {
-          title: i18n.global.t('appPageTitle.eventLogs'),
+          title: i18n.global.t('appPageTitle.pcieTopology'),
         },
       },
       {
-        path: '/logs/audit-logs',
-        name: 'audit-logs',
-        component: AuditLogs,
+        path: '/hardware-status/concurrent-maintenance',
+        name: 'concurrent-maintenance',
+        component: ConcurrentMaintenance,
         meta: {
-          title: i18n.global.t('appPageTitle.auditLogs'),
+          title: i18n.global.t('appPageTitle.concurrentMaintenance'),
         },
       },
       {
-        path: '/logs/dumps',
-        name: 'dumps',
-        component: Dumps,
+        path: '/security-and-access/sessions',
+        name: 'sessions',
+        component: Sessions,
         meta: {
-          title: i18n.global.t('appPageTitle.dumps'),
+          title: i18n.global.t('appPageTitle.sessions'),
         },
       },
       {
-        path: '/logs/post-code-logs',
-        name: 'post-code-logs',
-        component: PostCodeLogs,
+        path: '/security-and-access/ldap',
+        name: 'ldap',
+        component: Ldap,
         meta: {
-          title: i18n.global.t('appPageTitle.postCodeLogs'),
+          title: i18n.global.t('appPageTitle.ldap'),
         },
       },
       {
-        path: '/operations/kvm',
-        name: 'kvm',
-        component: Kvm,
+        path: '/security-and-access/user-management',
+        name: 'local-users',
+        component: UserManagement,
         meta: {
-          title: i18n.global.t('appPageTitle.kvm'),
+          title: i18n.global.t('appPageTitle.userManagement'),
         },
       },
       {
@@ -252,70 +207,60 @@ export const routes = [
           title: i18n.global.t('appPageTitle.policies'),
         },
       },
-      { path: '/operations/key-clear', name: 'key-clear', component: KeyClear },
       {
-        path: '/operations/reboot-bmc',
-        name: 'reboot-bmc',
-        component: RebootBmc,
-        meta: {
-          title: i18n.global.t('appPageTitle.rebootBmc'),
-        },
-      },
-
-      {
-        path: '/operations/factory-reset',
-        name: 'factory-reset',
-        component: FactoryReset,
+        path: '/security-and-access/certificates',
+        name: 'certificates',
+        component: Certificates,
         meta: {
-          title: i18n.global.t('appPageTitle.factoryReset'),
+          title: i18n.global.t('appPageTitle.certificates'),
         },
       },
       {
-        path: '/operations/firmware',
-        name: 'firmware',
-        component: Firmware,
+        path: '/settings/date-time',
+        name: 'date-time',
+        component: DateTime,
         meta: {
-          title: i18n.global.t('appPageTitle.firmware'),
+          title: i18n.global.t('appPageTitle.dateTime'),
         },
       },
       {
-        path: '/operations/host-console',
-        name: 'host-console',
-        component: HostConsole,
+        path: '/settings/snmp-alerts',
+        name: 'snmp-alerts',
+        component: SnmpAlerts,
         meta: {
-          title: i18n.global.t('appPageTitle.hostConsole'),
+          title: i18n.global.t('appPageTitle.snmpAlerts'),
         },
       },
       {
-        path: '/logs/deconfiguration-records',
-        name: 'deconfiguration-records',
-        component: DeconfigurationRecords,
+        path: '/operations/factory-reset',
+        name: 'factory-reset',
+        component: FactoryReset,
         meta: {
-          title: i18n.global.t('appPageTitle.deconfigurationRecords'),
+          title: i18n.global.t('appPageTitle.factoryReset'),
         },
       },
-      {
-        path: '/settings/power-restore-policy',
-        name: 'power-restore-policy',
-        component: PowerRestorePolicy,
+      { 
+        path: '/operations/key-clear',
+        name: 'key-clear',
+        component: KeyClear,
         meta: {
-          title: i18n.global.t('appPageTitle.powerRestorePolicy'),
+          title: i18n.global.t('appPageTitle.keyClear'),
         },
       },
       {
-        path: '/settings/snmp-alerts',
-        name: 'snmp-alerts',
-        component: SnmpAlerts,
+        path: '/operations/kvm',
+        name: 'kvm',
+        component: Kvm,
         meta: {
-          title: i18n.global.t('appPageTitle.snmpAlerts'),
+          title: i18n.global.t('appPageTitle.kvm'),
         },
       },
       {
-        path: '/settings/date-time',
-        name: 'date-time',
-        component: DateTime,
+        path: '/operations/firmware',
+        name: 'firmware',
+        component: Firmware,
         meta: {
-          title: i18n.global.t('appPageTitle.dateTime'),
+          title: i18n.global.t('appPageTitle.firmware'),
         },
       },
       {
@@ -335,11 +280,11 @@ export const routes = [
         },
       },
       {
-        path: '/resource-management/power',
-        name: 'power',
-        component: Power,
+        path: '/settings/power-restore-policy',
+        name: 'power-restore-policy',
+        component: PowerRestorePolicy,
         meta: {
-          title: i18n.global.t('appPageTitle.power'),
+          title: i18n.global.t('appPageTitle.powerRestorePolicy'),
         },
       },
       {
@@ -350,22 +295,6 @@ export const routes = [
           title: i18n.global.t('appPageTitle.systemParameters'),
         },
       },
-      {
-        path: '/resource-management/capacity-on-demand',
-        name: 'capacity-on-demand',
-        component: CapacityOnDemand,
-        meta: {
-          title: i18n.global.t('appPageTitle.capacityOnDemand'),
-        },
-      },
-      {
-        path: '/resource-management/field-core-override',
-        name: 'field-core-override',
-        component: FieldCoreOverride,
-        meta: {
-          title: i18n.global.t('appPageTitle.fieldCoreOverride'),
-        },
-      },
       {
         path: '/resource-management/memory',
         name: 'memory',
@@ -375,51 +304,52 @@ export const routes = [
         },
       },
       {
-        path: '/security-and-access/sessions',
-        name: 'sessions',
-        component: Sessions,
+        path: '/resource-management/power',
+        name: 'power',
+        component: Power,
         meta: {
-          title: i18n.global.t('appPageTitle.sessions'),
+          title: i18n.global.t('appPageTitle.power'),
         },
       },
       {
-        path: '/security-and-access/user-management',
-        name: 'local-users',
-        component: UserManagement,
+        path: '/operations/reboot-bmc',
+        name: 'reboot-bmc',
+        component: RebootBmc,
         meta: {
-          title: i18n.global.t('appPageTitle.userManagement'),
+          title: i18n.global.t('appPageTitle.rebootBmc'),
         },
       },
       {
-        path: '/security-and-access/certificates',
-        name: 'certificates',
-        component: Certificates,
+        path: '/operations/host-console',
+        name: 'host-console',
+        component: HostConsole,
         meta: {
-          title: i18n.global.t('appPageTitle.certificates'),
+          title: i18n.global.t('appPageTitle.hostConsole'),
         },
       },
       {
-        path: '/:pathMatch(.*)*',
-        name: 'page-not-found',
-        component: PageNotFound,
+        path: '/operations/server-power-operations',
+        name: 'server-power-operations',
+        component: ServerPowerOperations,
         meta: {
-          title: i18n.global.t('appPageTitle.pageNotFound'),
+          title: i18n.global.t('appPageTitle.serverPowerOperations'),
         },
       },
       {
-        path: '/security-and-access/ldap',
-        name: 'ldap',
-        component: Ldap,
+        path: '/operations/virtual-media',
+        name: 'virtual-media',
+        component: VirtualMedia,
         meta: {
-          title: i18n.global.t('appPageTitle.ldap'),
+          title: i18n.global.t('appPageTitle.virtualMedia'),
         },
       },
       {
-        path: '/notices',
-        name: 'notices',
-        component: Notices,
+        // path: '/:pathMatch(.*)*',
+        path: '*',
+        name: 'page-not-found',
+        component: PageNotFound,
         meta: {
-          title: i18n.global.t('appPageTitle.notices'),
+          title: i18n.global.t('appPageTitle.pageNotFound'),
         },
       },
     ],
diff --git a/src/store/api.js b/src/store/api.js
index 07c0036747..26380e0e93 100644
--- a/src/store/api.js
+++ b/src/store/api.js
@@ -3,7 +3,7 @@ import Axios from 'axios';
 //Do not change store import.
 //Exact match alias set to support
 //dotenv customizations.
-import { GlobalStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 import { useRouter } from 'vue-router';
 
 Axios.defaults.headers.common['Accept'] = [
@@ -18,8 +18,8 @@ const api = Axios.create({
 });
 
 api.interceptors.response.use(undefined, (error) => {
-  const globalStore = GlobalStore();
-  const authenticationStore = AuthenticationStore();
+  const globalStore = stores.GlobalStore();
+  const authenticationStore = stores.AuthenticationStore();
   let response = error.response;
   // TODO: Provide user with a notification and way to keep system active
   if (response.status == 401) {
diff --git a/src/store/index.js b/src/store/index.js
index e9d55b7bed..d455c65346 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,82 +1,163 @@
-//TODO: Work Requird -->
-import EventLogStore from './modules/Logs/EventLogStore';
 import GlobalStore from './modules/GlobalStore';
 import AuthenticationStore from './modules/Authentication/AuthenticationStore';
+import SessionsStore from './modules/SecurityAndAccess/SessionsStore';
+import LdapStore from './modules/SecurityAndAccess/LdapStore';
+import UserManagementStore from './modules/SecurityAndAccess/UserManagementStore';
+import CertificatesStore from './modules/SecurityAndAccess/CertificatesStore';
 import FirmwareStore from './modules/Operations/FirmwareStore';
-import SystemStore from './modules/HardwareStatus/SystemStore';
-import NetworkStore from './modules/Settings/NetworkStore';
-import PowerControlStore from './modules/ResourceManagement/PowerControlStore';
-import KeyClearStore from './modules/Operations/KeyClearStore';
-import ControlStore from './modules/Operations/ControlStore';
 import BootSettingsStore from './modules/Operations/BootSettingsStore';
-import FactoryResetStore from './modules/Operations/FactoryResetStore';
-import ResourceMemoryStore from './modules/ResourceManagement/ResourceMemoryStore';
+import ControlStore from './modules/Operations/ControlStore';
+import PowerControlStore from './modules/ResourceManagement/PowerControlStore';
 import PowerPolicyStore from './modules/Settings/PowerPolicyStore';
-import ConcurrentMaintenanceStore from './modules/HardwareStatus/ConcurrentMaintenanceStore';
-import IBMiServiceFunctionsStore from './modules/Logs/IBMiServiceFunctionsStore';
-import AuditLogsStore from './modules/Logs/AuditLogsStore';
-import SessionsStore from './modules/SecurityAndAccess/SessionsStore.js';
-import LicenseStore from './modules/ResourceManagement/LicenseStore';
-import BmcStore from './modules/HardwareStatus/BmcStore';
-import ChassisStore from './modules/HardwareStatus/ChassisStore';
+import NetworkStore from './modules/Settings/NetworkStore';
+import EventLogStore from './modules/Logs/EventLogStore';
+// import SensorsStore from './modules/HardwareStatus/SensorsStore';
+// import ServerLedStore from './modules/HardwareStatus/ServerLedStore';
+import SystemStore from './modules/HardwareStatus/SystemStore';
 import PowerSupplyStore from './modules/HardwareStatus/PowerSupplyStore';
-import PcieSlotsStore from './modules/HardwareStatus/PcieSlotsStore';
-import FanStore from './modules/HardwareStatus/FanStore';
 import MemoryStore from './modules/HardwareStatus/MemoryStore';
+import FanStore from './modules/HardwareStatus/FanStore';
+import ChassisStore from './modules/HardwareStatus/ChassisStore';
+import BmcStore from './modules/HardwareStatus/BmcStore';
+import ProcessorStore from './modules/HardwareStatus/ProcessorStore';
 import AssemblyStore from './modules/HardwareStatus/AssemblyStore';
-import FabricAdaptersStore from './modules/HardwareStatus/FabricAdaptersStore';
-import SystemParametersStore from './modules/ResourceManagement/SystemParametersStore';
-import CertificatesStore from './modules/SecurityAndAccess/CertificatesStore';
-import UserManagementStore from './modules/SecurityAndAccess/UserManagementStore';
-import PcieTopologyStore from './modules/HardwareStatus/PcieTopologyStore.js';
+import PcieTopologyStore from './modules/HardwareStatus/PcieTopologyStore';
+import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore';
+import AuditLogsStore from './modules/Logs/AuditLogsStore';
+// import PoliciesStore from './modules/SecurityAndAccess/PoliciesStore';
+import FactoryResetStore from './modules/Operations/FactoryResetStore';
 import HardwareDeconfigurationStore from './modules/Settings/HardwareDeconfigurationStore';
-import DeconfigurationRecordsStore from './modules/Logs/DeconfigurationRecordsStore.js';
-import NetworkSettingsStore from './modules/Operations/NetworkSettingsStore.js';
-import LdapStore from './modules/SecurityAndAccess/LdapStore.js';
-import DumpsStore from './modules/Logs/DumpsStore.js';
-import FieldCoreOverrideStore from './modules/ResourceManagement/FieldCoreOverrideStore.js';
-import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore.js';
+import KeyClearStore from './modules/Operations/KeyClearStore';
+import NetworkSettingsStore from './modules/Operations/NetworkSettingsStore';
+import IBMiServiceFunctionsStore from './modules/Logs/IBMiServiceFunctionsStore';
+import SnmpAlertsStore from './modules/Settings/SnmpAlertsStore';
+// import WebSocketPlugin from './plugins/WebSocketPlugin';
 import DateTimeStore from './modules/Settings/DateTimeStore';
-import SnmpAlertsStore from './modules/Settings/SnmpAlertsStore.js';
+// import VirtualMediaStore from './modules/Operations/VirtualMediaStore';
+import ResourceMemoryStore from './modules/ResourceManagement/ResourceMemoryStore';
+import SystemParametersStore from './modules/ResourceManagement/SystemParametersStore';
+import DeconfigurationRecordsStore from './modules/Logs/DeconfigurationRecordsStore';
+import ConcurrentMaintenanceStore from './modules/HardwareStatus/ConcurrentMaintenanceStore';
+import PcieSlotsStore from './modules/HardwareStatus/PcieSlotsStore';
+import FabricAdaptersStore from './modules/HardwareStatus/FabricAdaptersStore';
+
 // ... (export use other stores)
-export {
-  EventLogStore,
-  GlobalStore,
-  AuthenticationStore,
-  FirmwareStore,
-  SystemStore,
-  NetworkStore,
-  PowerControlStore,
-  KeyClearStore,
-  ControlStore,
-  BootSettingsStore,
-  FactoryResetStore,
-  ResourceMemoryStore,
-  PowerPolicyStore,
-  ConcurrentMaintenanceStore,
-  IBMiServiceFunctionsStore,
-  AuditLogsStore,
-  SessionsStore,
-  LicenseStore,
-  ChassisStore,
-  PowerSupplyStore,
-  PcieSlotsStore,
-  PostCodeLogsStore,
-  FanStore,
-  MemoryStore,
-  BmcStore,
-  AssemblyStore,
-  FabricAdaptersStore,
-  SystemParametersStore,
-  CertificatesStore,
-  UserManagementStore,
-  PcieTopologyStore,
-  HardwareDeconfigurationStore,
-  DeconfigurationRecordsStore,
-  NetworkSettingsStore,
-  LdapStore,
-  DumpsStore,
-  FieldCoreOverrideStore,
-  DateTimeStore,
-  SnmpAlertsStore,
-};
+
+const stores = {};
+
+  Object.assign(stores, {
+    GlobalStore: GlobalStore,
+  });
+    Object.assign(stores, {
+    AuthenticationStore: AuthenticationStore,
+  });
+    Object.assign(stores, {
+    ConcurrentMaintenanceStore: ConcurrentMaintenanceStore,
+  });
+    Object.assign(stores, {
+    SessionsStore: SessionsStore,
+  });
+    Object.assign(stores, {
+    DateTimeStore: DateTimeStore,
+  });
+    Object.assign(stores, {
+    LdapStore: LdapStore,
+  });
+    Object.assign(stores, {
+    UserManagementStore: UserManagementStore,
+  });
+    Object.assign(stores, {
+    FirmwareStore: FirmwareStore,
+  });
+    Object.assign(stores, {
+    BootSettingsStore: BootSettingsStore,
+  });
+    Object.assign(stores, {
+    ControlStore: ControlStore,
+  });
+      Object.assign(stores, {
+    PcieTopologyStore: PcieTopologyStore,
+  });
+      Object.assign(stores, {
+    PowerControlStore: PowerControlStore,
+  });
+      Object.assign(stores, {
+    PowerPolicyStore: PowerPolicyStore,
+  });
+      Object.assign(stores, {
+    PowerPolicyStore: PowerPolicyStore,
+  });
+      Object.assign(stores, {
+    PowerSupplyStore: PowerSupplyStore,
+  });
+      Object.assign(stores, {
+    NetworkStore: NetworkStore,
+  });
+      Object.assign(stores, {
+    EventLogStore: EventLogStore,
+  });
+      Object.assign(stores, {
+    SnmpAlertsStore: SnmpAlertsStore,
+  });
+      Object.assign(stores, {
+    CertificatesStore: CertificatesStore,
+  });
+      Object.assign(stores, {
+    SystemStore: SystemStore,
+  });
+      Object.assign(stores, {
+    MemoryStore: MemoryStore,
+  });
+      Object.assign(stores, {
+    FanStore: FanStore,
+  });
+      Object.assign(stores, {
+    ChassisStore: ChassisStore,
+  });
+      Object.assign(stores, {
+    BmcStore: BmcStore,
+  });
+      Object.assign(stores, {
+    ProcessorStore: ProcessorStore,
+  });
+      Object.assign(stores, {
+    AssemblyStore: AssemblyStore,
+  });
+      Object.assign(stores, {
+    PcieSlotsStore: PcieSlotsStore,
+  });
+      Object.assign(stores, {
+    PostCodeLogsStore: PostCodeLogsStore,
+  });
+      Object.assign(stores, {
+    AuditLogsStore: AuditLogsStore,
+  });
+      Object.assign(stores, {
+    FactoryResetStore: FactoryResetStore,
+  });
+      Object.assign(stores, {
+    KeyClearStore: KeyClearStore,
+  });
+      Object.assign(stores, {
+    NetworkSettingsStore: NetworkSettingsStore,
+  });
+      Object.assign(stores, {
+    ResourceMemoryStore: ResourceMemoryStore,
+  });
+      Object.assign(stores, {
+    HardwareDeconfigurationStore: HardwareDeconfigurationStore,
+  });
+      Object.assign(stores, {
+    DeconfigurationRecordsStore: DeconfigurationRecordsStore,
+  });
+      Object.assign(stores, {
+    SystemParametersStore: SystemParametersStore,
+  });
+      Object.assign(stores, {
+    FabricAdaptersStore: FabricAdaptersStore,
+  });
+      Object.assign(stores, {
+    IBMiServiceFunctionsStore: IBMiServiceFunctionsStore,
+  });
+
+  export default stores;
diff --git a/src/store/modules/Authentication/AuthenticanStore.js b/src/store/modules/Authentication/AuthenticanStore.js
index 251d7b902b..44b12fc177 100644
--- a/src/store/modules/Authentication/AuthenticanStore.js
+++ b/src/store/modules/Authentication/AuthenticanStore.js
@@ -1,107 +1,107 @@
-import api from '@/store/api';
-import Cookies from 'js-cookie';
-import router from '@/router';
+// import api from '@/store/api';
+// import Cookies from 'js-cookie';
+// import router from '@/router';
 
-const AuthenticationStore = {
-  namespaced: true,
-  state: {
-    loginPageDetails: {},
-    authError: false,
-    unauthError: false,
-    xsrfCookie: Cookies.get('XSRF-TOKEN'),
-    isAuthenticatedCookie: Cookies.get('IsAuthenticated'),
-  },
-  getters: {
-    loginPageDetails: (state) => state.loginPageDetails,
-    authError: (state) => state.authError,
-    unauthError: (state) => state.unauthError,
-    isLoggedIn: (state) => {
-      return (
-        state.xsrfCookie !== undefined || state.isAuthenticatedCookie == 'true'
-      );
-    },
-    token: (state) => state.xsrfCookie,
-  },
-  mutations: {
-    setLoginPageDetails: (state, loginPageDetails) =>
-      (state.loginPageDetails = loginPageDetails),
-    authSuccess(state) {
-      state.authError = false;
-      state.unauthError = false;
-      state.xsrfCookie = Cookies.get('XSRF-TOKEN');
-    },
-    authError(state, authError = true) {
-      state.authError = authError;
-    },
-    unauthError(state, unauthError = true) {
-      state.unauthError = unauthError;
-    },
-    logout(state) {
-      Cookies.remove('XSRF-TOKEN');
-      Cookies.remove('IsAuthenticated');
-      localStorage.removeItem('storedModelType');
-      localStorage.removeItem('storedUsername');
-      localStorage.removeItem('storedCurrentUser');
-      localStorage.removeItem('storedHmcManagedValue');
-      localStorage.removeItem('storedLanguage');
-      state.xsrfCookie = undefined;
-      state.isAuthenticatedCookie = undefined;
-    },
-  },
-  actions: {
-    login({ commit }, { username, password }) {
-      commit('authError', false);
-      commit('unauthError', false);
-      return api
-        .post('/login', { data: [username, password] })
-        .then(() => commit('authSuccess'))
-        .catch((error) => {
-          commit('authError');
-          throw new Error(error);
-        });
-    },
-    unauthlogin({ commit }) {
-      commit('unauthError');
-    },
-    logout({ commit }) {
-      api
-        .post('/logout', { data: [] })
-        .then(() => commit('logout'))
-        .then(() => router.replace('/login'))
-        .catch((error) => console.log(error));
-    },
-    async checkPasswordChangeRequired(_, username) {
-      return api
-        .get(`/redfish/v1/AccountService/Accounts/${username}`)
-        .then(({ data: { PasswordChangeRequired } }) => {
-          return PasswordChangeRequired;
-        })
-        .catch((error) => {
-          console.log(error);
-        });
-    },
-    async dateAndTime({ commit }) {
-      return api
-        .get(`/redfish/v1/`)
-        .then((response) => response.data.Oem.IBM)
-        .then((data) => {
-          const loginPageDetails = {
-            dateTime: new Date(data.DateTime),
-            model: data.Model,
-            serial: data.SerialNumber,
-            acfWindowActive: data.ACFWindowActive,
-          };
-          commit('setLoginPageDetails', loginPageDetails);
-        })
-        .catch((error) => console.log(error));
-    },
-    resetStoreState({ state }) {
-      state.authError = false;
-      state.unauthError = false;
-      state.xsrfCookie = Cookies.get('XSRF-TOKEN');
-      state.isAuthenticatedCookie = Cookies.get('IsAuthenticated');
-    },
-  },
-};
+// const AuthenticationStore = {
+//   namespaced: true,
+//   state: {
+//     loginPageDetails: {},
+//     authError: false,
+//     unauthError: false,
+//     xsrfCookie: Cookies.get('XSRF-TOKEN'),
+//     isAuthenticatedCookie: Cookies.get('IsAuthenticated'),
+//   },
+//   getters: {
+//     loginPageDetails: (state) => state.loginPageDetails,
+//     authError: (state) => state.authError,
+//     unauthError: (state) => state.unauthError,
+//     isLoggedIn: (state) => {
+//       return (
+//         state.xsrfCookie !== undefined || state.isAuthenticatedCookie == 'true'
+//       );
+//     },
+//     token: (state) => state.xsrfCookie,
+//   },
+//   mutations: {
+//     setLoginPageDetails: (state, loginPageDetails) =>
+//       (state.loginPageDetails = loginPageDetails),
+//     authSuccess(state) {
+//       state.authError = false;
+//       state.unauthError = false;
+//       state.xsrfCookie = Cookies.get('XSRF-TOKEN');
+//     },
+//     authError(state, authError = true) {
+//       state.authError = authError;
+//     },
+//     unauthError(state, unauthError = true) {
+//       state.unauthError = unauthError;
+//     },
+//     logout(state) {
+//       Cookies.remove('XSRF-TOKEN');
+//       Cookies.remove('IsAuthenticated');
+//       localStorage.removeItem('storedModelType');
+//       localStorage.removeItem('storedUsername');
+//       localStorage.removeItem('storedCurrentUser');
+//       localStorage.removeItem('storedHmcManagedValue');
+//       localStorage.removeItem('storedLanguage');
+//       state.xsrfCookie = undefined;
+//       state.isAuthenticatedCookie = undefined;
+//     },
+//   },
+//   actions: {
+//     login({ commit }, { username, password }) {
+//       commit('authError', false);
+//       commit('unauthError', false);
+//       return api
+//         .post('/login', { data: [username, password] })
+//         .then(() => commit('authSuccess'))
+//         .catch((error) => {
+//           commit('authError');
+//           throw new Error(error);
+//         });
+//     },
+//     unauthlogin({ commit }) {
+//       commit('unauthError');
+//     },
+//     logout({ commit }) {
+//       api
+//         .post('/logout', { data: [] })
+//         .then(() => commit('logout'))
+//         .then(() => router.replace('/login'))
+//         .catch((error) => console.log(error));
+//     },
+//     async checkPasswordChangeRequired(_, username) {
+//       return api
+//         .get(`/redfish/v1/AccountService/Accounts/${username}`)
+//         .then(({ data: { PasswordChangeRequired } }) => {
+//           return PasswordChangeRequired;
+//         })
+//         .catch((error) => {
+//           console.log(error);
+//         });
+//     },
+//     async dateAndTime({ commit }) {
+//       return api
+//         .get(`/redfish/v1/`)
+//         .then((response) => response.data.Oem.IBM)
+//         .then((data) => {
+//           const loginPageDetails = {
+//             dateTime: new Date(data.DateTime),
+//             model: data.Model,
+//             serial: data.SerialNumber,
+//             acfWindowActive: data.ACFWindowActive,
+//           };
+//           commit('setLoginPageDetails', loginPageDetails);
+//         })
+//         .catch((error) => console.log(error));
+//     },
+//     resetStoreState({ state }) {
+//       state.authError = false;
+//       state.unauthError = false;
+//       state.xsrfCookie = Cookies.get('XSRF-TOKEN');
+//       state.isAuthenticatedCookie = Cookies.get('IsAuthenticated');
+//     },
+//   },
+// };
 
-export default AuthenticationStore;
+// export default AuthenticationStore;
diff --git a/src/store/plugins/WebSocketPlugin.js b/src/store/plugins/WebSocketPlugin.js
index e7699d6d3b..c166138e47 100644
--- a/src/store/plugins/WebSocketPlugin.js
+++ b/src/store/plugins/WebSocketPlugin.js
@@ -1,5 +1,5 @@
 import JSONbig from 'json-bigint';
-import { AuthenticationStore, GlobalStore, EventLogStore } from '@/store';
+import stores from '@/store';
 /**
  * WebSocketPlugin will allow us to get new data from the server
  * without having to poll for changes on the frontend.
@@ -25,9 +25,9 @@ const data = {
 };
 
 export const initWebSocket = () => {
-  const globalStore = GlobalStore();
-  const authenticationStore = AuthenticationStore();
-  const eventLogStore = EventLogStore();
+  const globalStore = stores.GlobalStore();
+  const authenticationStore = stores.AuthenticationStore();
+  const eventLogStore = stores.EventLogStore();
 
   const socketDisabled =
     import.meta.env.VITE_APP_SUBSCRIBE_SOCKET_DISABLED === 'true'
diff --git a/src/views/ChangePassword/ChangePassword.vue b/src/views/ChangePassword/ChangePassword.vue
index a23ffba0ff..e3b2fd3d5e 100644
--- a/src/views/ChangePassword/ChangePassword.vue
+++ b/src/views/ChangePassword/ChangePassword.vue
@@ -78,7 +78,7 @@
 <script setup>
 import { ref, computed} from 'vue'
 import i18n from '@/i18n';
-import { UserManagementStore, GlobalStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 import { required, sameAs } from '@vuelidate/validators';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import { useVuelidate } from '@vuelidate/core';
@@ -87,9 +87,9 @@ import InfoTooltipPassword from '@/components/Global/InfoTooltipPassword.vue';
 import InputPasswordToggle from '@/components/Global/InputPasswordToggle.vue';
 import { useRouter } from 'vue-router';
 
-const global = GlobalStore();
-const userManagementStore = UserManagementStore();
-const authenticationStore = AuthenticationStore();
+const global = stores.GlobalStore();
+const userManagementStore = stores.UserManagementStore();
+const authenticationStore = stores.AuthenticationStore();
 
 const router = useRouter();
 const { getValidationState } = useVuelidateComposable();
diff --git a/src/views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue b/src/views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue
index 28abfb2b8c..21ff315411 100644
--- a/src/views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue
+++ b/src/views/HardwareStatus/ConcurrentMaintenance/ConcurrentMaintenance.vue
@@ -96,12 +96,12 @@
 import { computed, onBeforeMount } from 'vue';
 import useToast from '@/components/Composables/useToastComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
-import { ConcurrentMaintenanceStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 
-const concurrentMaintenanceStore = ConcurrentMaintenanceStore();
+const concurrentMaintenanceStore = stores.ConcurrentMaintenanceStore();
 
 const readyToRemoveState = computed({
   get() {
diff --git a/src/views/HardwareStatus/Inventory/Inventory.vue b/src/views/HardwareStatus/Inventory/Inventory.vue
index 97b51ec835..f5fdda6a2c 100644
--- a/src/views/HardwareStatus/Inventory/Inventory.vue
+++ b/src/views/HardwareStatus/Inventory/Inventory.vue
@@ -191,7 +191,7 @@ import { default as IconJumpLink } from '@carbon/icons-vue/es/jump-link/16';
 import { chunk } from 'lodash';
 import { computed, watch, onBeforeMount, ref, reactive } from 'vue';
 import ChassisStore from '../../../store/modules/HardwareStatus/ChassisStore';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import eventBus from '@/eventBus';
 import { useI18n } from 'vue-i18n';
@@ -200,7 +200,7 @@ import { BLink } from 'bootstrap-vue-next';
 
 const { startLoader, endLoader } = useLoadingBar();
 const chassisStore = ChassisStore();
-const global = GlobalStore();
+const global = stores.GlobalStore();
 
 const isBusy = ref(false);
 const currentTab = ref(0);
diff --git a/src/views/HardwareStatus/Inventory/InventoryFabricAdapters.vue b/src/views/HardwareStatus/Inventory/InventoryFabricAdapters.vue
index 26a8f5ce1f..af14ad6d58 100644
--- a/src/views/HardwareStatus/Inventory/InventoryFabricAdapters.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryFabricAdapters.vue
@@ -157,13 +157,12 @@ import useDataFormatterGlobal from '../../../components/Composables/useDataForma
 import useSearchFilterComposable from '../../../components/Composables/useSearchFilterComposable';
 import { useI18n } from 'vue-i18n';
 import { reactive, ref, computed, watch, onBeforeMount } from 'vue';
-import { GlobalStore } from '../../../store';
-import { FabricAdaptersStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 
-const globalStore = GlobalStore();
-const fabricAdaptersStore = FabricAdaptersStore();
+const globalStore = stores.GlobalStore();
+const fabricAdaptersStore = stores.FabricAdaptersStore();
 const props = defineProps({
   chassis: {
     type: String,
diff --git a/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue b/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue
index e7f04440c9..6fbd27de58 100644
--- a/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryServiceIndicator.vue
@@ -96,15 +96,14 @@
 <script setup>
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import PageSection from '@/components/Global/PageSection.vue';
-import { SystemStore } from '../../../store';
+import stores from '../../../store';
 import { ref, computed, watch, onBeforeMount } from 'vue';
-import { GlobalStore } from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 
 const { successToast, errorToast } = useToast();
-const globalStore = GlobalStore();
-const systemStore = SystemStore();
+const globalStore = stores.GlobalStore();
+const systemStore = stores.SystemStore();
 const isLampTestEditable = ref(true);
 
 const systems = computed(() => {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
index 8e04dcfe72..d34916332f 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue
@@ -161,8 +161,7 @@ import useDataFormatterGlobal from '../../../components/Composables/useDataForma
 import useTableRowExpandComposable from '../../../components/Composables/useTableRowExpandComposable';
 import useToast from '@/components/Composables/useToastComposable';
 import useSearchFilterComposable from '../../../components/Composables/useSearchFilterComposable';
-import { GlobalStore } from '../../../store';
-import { AssemblyStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 
 const props = defineProps({
@@ -175,8 +174,8 @@ const props = defineProps({
 const { searchFilterInput, onChangeSearch, onClearSearch } =
   useSearchFilterComposable();
 const { successToast, errorToast } = useToast();
-const globalStore = GlobalStore();
-const assemblyStore = AssemblyStore();
+const globalStore = stores.GlobalStore();
+const assemblyStore = stores.AssemblyStore();
 const { dataFormatter, statusIconValue } = useDataFormatterGlobal();
 const { expandRowLabel, toggleRow } = useTableRowExpandComposable();
 const { t } = useI18n();
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index 9725e9265e..a87b48e536 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -135,7 +135,7 @@ import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 import { reactive, ref, computed, onBeforeMount } from 'vue';
 import useDataFormatterGlobal from '../../../components/Composables/useDataFormatterGlobal';
 import useTableRowExpandComposable from '../../../components/Composables/useTableRowExpandComposable';
-import { BmcStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import { useI18n } from 'vue-i18n';
 import useToast from '@/components/Composables/useToastComposable';
@@ -143,7 +143,7 @@ import useToast from '@/components/Composables/useToastComposable';
 const { successToast, errorToast } = useToast();
 const { expandRowLabel, toggleRow } = useTableRowExpandComposable();
 const { dataFormatter, statusIconValue } = useDataFormatterGlobal();
-const bmcStore = BmcStore();
+const bmcStore = stores.BmcStore();
 const isBusy = ref(false);
 const { t } = useI18n();
 const fields = reactive([
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
index fa67ac8016..d0139f5612 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -120,7 +120,7 @@ import useDataFormatterGlobal from '../../../components/Composables/useDataForma
 import useTableRowExpandComposable from '../../../components/Composables/useTableRowExpandComposable';
 import { reactive, ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { ChassisStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 
@@ -129,7 +129,7 @@ const { t } = useI18n();
 const isBusy = ref(true);
 const { dataFormatter, statusIconValue } = useDataFormatterGlobal();
 const { expandRowLabel, toggleRow } = useTableRowExpandComposable();
-const chassisStore = ChassisStore();
+const chassisStore = stores.ChassisStore();
 
 const fields = reactive([
   {
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index 3f770a3f39..8dd942bf1e 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -172,7 +172,7 @@ import useToast from '@/components/Composables/useToastComposable';
 
 import { ref, reactive, computed, onBeforeMount } from 'vue';
 
-import { MemoryStore } from '../../../store';
+import stores from '../../../store';
 
 const { searchFilterInput, onChangeSearch, onClearSearch } =
   useSearchFilterComposable();
@@ -182,7 +182,7 @@ const isBusy = ref(false);
 const { t } = useI18n();
 const searchTotalFilteredRows = ref(0);
 const { dataFormatter, statusIconValue } = useDataFormatterGlobal();
-const memoryStore = MemoryStore();
+const memoryStore = stores.MemoryStore();
 const { successToast, errorToast } = useToast();
 
 const fields = reactive([
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
index 72935b89f4..d34152c918 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -164,8 +164,7 @@ import Search from '@/components/Global/Search.vue';
 import { reactive, ref, computed, watch, onBeforeMount } from 'vue';
 import useSearchFilterComposable from '../../../components/Composables/useSearchFilterComposable';
 import useTableRowExpandComposable from '../../../components/Composables/useTableRowExpandComposable';
-import { FanStore } from '../../../store';
-import { GlobalStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 import { useI18n } from 'vue-i18n';
@@ -182,8 +181,8 @@ const props = defineProps({
   },
 });
 
-const fanStore = FanStore();
-const globalStore = GlobalStore();
+const fanStore = stores.FanStore();
+const globalStore = stores.GlobalStore();
 const isBusy = ref(false);
 const { successToast, errorToast } = useToast();
 const { toggleRow } = useTableRowExpandComposable();
diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePcieSlots.vue b/src/views/HardwareStatus/Inventory/InventoryTablePcieSlots.vue
index 020d065f5a..242d26523c 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTablePcieSlots.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePcieSlots.vue
@@ -86,8 +86,7 @@ import {
 
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import useSearchFilterComposable from '../../../components/Composables/useSearchFilterComposable';
-import { PcieSlotsStore } from '../../../store';
-import { GlobalStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 import { useI18n } from 'vue-i18n';
@@ -101,8 +100,8 @@ const props = defineProps({
   },
 });
 const { t } = useI18n();
-const pcieSlotsStore = PcieSlotsStore();
-const globalStore = GlobalStore();
+const pcieSlotsStore = stores.PcieSlotsStore();
+const globalStore = stores.GlobalStore();
 const isBusy = ref(true);
 const searchTotalFilteredRows = ref(0);
 const { successToast, errorToast } = useToast();
diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index bee1d77f2c..3ee866ae5d 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -179,16 +179,15 @@ import {
   onBeforeMount,
 } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { PowerSupplyStore } from '../../../store';
-import { GlobalStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
 import useToast from '@/components/Composables/useToastComposable';
 import { BFormCheckbox } from 'bootstrap-vue-next';
 
 const { t } = useI18n();
 const { successToast, errorToast } = useToast();
-const powerSupplyStore = PowerSupplyStore();
-const globalStore = GlobalStore();
+const powerSupplyStore = stores.PowerSupplyStore();
+const globalStore = stores.GlobalStore();
 const { expandRowLabel, toggleRow } = useTableRowExpandComposable();
 const { dataFormatter } = useDataFormatterGlobal();
 const { statusIconValue } = useDataFormatterGlobal();
diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index fff7042975..4d6bc4bd48 100644
--- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -127,11 +127,11 @@ import useDataFormatterGlobal from '../../../components/Composables/useDataForma
 import useTableRowExpandComposable from '../../../components/Composables/useTableRowExpandComposable';
 import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { SystemStore } from '../../../store';
+import stores from '../../../store';
 
 import eventBus from '@/eventBus';
 
-const systemStore = SystemStore();
+const systemStore = stores.SystemStore();
 const { dataFormatter, statusIconValue } = useDataFormatterGlobal();
 const { expandRowLabel, toggleRow } = useTableRowExpandComposable();
 const { t } = useI18n();
diff --git a/src/views/HardwareStatus/PcieTopology/IdentifyLedsModal.vue b/src/views/HardwareStatus/PcieTopology/IdentifyLedsModal.vue
index 1cbbc34d4a..f2dcd5effd 100644
--- a/src/views/HardwareStatus/PcieTopology/IdentifyLedsModal.vue
+++ b/src/views/HardwareStatus/PcieTopology/IdentifyLedsModal.vue
@@ -93,12 +93,12 @@
 <script setup>
 
 import { ref,defineProps,watch, computed} from 'vue';
-import { PcieTopologyStore } from '../../../store';
+import stores from '../../../store';
 import useDataFormatterGlobal from '../../../components/Composables/useDataFormatterGlobal';
 import useToast from '@/components/Composables/useToastComposable';
 import i18n from '@/i18n';
 
-const pcieTopologyStore=PcieTopologyStore();
+const pcieTopologyStore= stores.PcieTopologyStore();
 const {dataFormatter}=useDataFormatterGlobal()
 const props=defineProps({
   selectedObj: {
diff --git a/src/views/HardwareStatus/PcieTopology/PcieTopology.vue b/src/views/HardwareStatus/PcieTopology/PcieTopology.vue
index 5f01fb867d..cb2a927c04 100644
--- a/src/views/HardwareStatus/PcieTopology/PcieTopology.vue
+++ b/src/views/HardwareStatus/PcieTopology/PcieTopology.vue
@@ -225,8 +225,7 @@ import useSearchFilterComposable from "../../../components/Composables/useSearch
 import useTableFilter from "../../../components/Composables/useTableFilterComposable";
 import usePaginationComposable from "../../../components/Composables/usePaginationComposable";
 import useLoadingBar from "@/components/Composables/useLoadingBarComposable";
-import { PcieTopologyStore } from "../../../store";
-import { GlobalStore } from "../../../store";
+import stores from "../../../store";
 import eventBus from "@/eventBus";
 import useToast from "@/components/Composables/useToastComposable";
 import i18n from '@/i18n';
@@ -240,8 +239,8 @@ const { searchFilterInput, onChangeSearch, onClearSearch } =
 const { getFilteredTableData } = useTableFilter();
 const { startLoader, endLoader } = useLoadingBar();
 const { dataFormatter } = useDataFormatterGlobal();
-const globalStore = GlobalStore();
-const pcieTopologyStore = PcieTopologyStore();
+const globalStore = stores.GlobalStore();
+const pcieTopologyStore = stores.PcieTopologyStore();
 const isBusy = ref(true);
 const resetOption = ref(null);
 const resetLinkUri = ref("");
diff --git a/src/views/HardwareStatus/PcieTopology/ResetLinkModal.vue b/src/views/HardwareStatus/PcieTopology/ResetLinkModal.vue
index dd8d27d33c..d906354057 100644
--- a/src/views/HardwareStatus/PcieTopology/ResetLinkModal.vue
+++ b/src/views/HardwareStatus/PcieTopology/ResetLinkModal.vue
@@ -40,15 +40,15 @@
   </b-modal>
 </template>
 <script setup>
-import { GlobalStore, PcieTopologyStore } from '../../../store';
+import stores from '../../../store';
 import useVuelidate from '@vuelidate/core';
 import useToast from '@/components/Composables/useToastComposable';
 import { ref,computed,nextTick } from 'vue';
 import i18n from '@/i18n';
 
 const { successToast, errorToast } = useToast();
-const pcieTopologyStore=PcieTopologyStore()
-const globalStore = GlobalStore();
+const pcieTopologyStore= stores.PcieTopologyStore()
+const globalStore = stores.GlobalStore();
 const props=defineProps({
   resetType: {
       type: Number,
diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue
index 5cacd7b4cd..26ff60a124 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -113,7 +113,7 @@
 <script setup>
 import { ref, reactive, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { AuthenticationStore, CertificatesStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import i18n from '@/i18n';
 import { useRouter } from 'vue-router';
 import eventBus from '@/eventBus';
@@ -130,10 +130,10 @@ import ModalUploadCertificate from './ModalUploadCertificate.vue';
 
 const passwordType = ref('password');
 const router = useRouter();
-const globalStore = GlobalStore();
+const globalStore = stores.GlobalStore();
 const { getValidationState } = useVuelidateComposable();
-const authenticationStore = AuthenticationStore();
-const certificatesStore = CertificatesStore();
+const authenticationStore = stores.AuthenticationStore();
+const certificatesStore = stores.CertificatesStore();
 const { dataFormatter } = useDataFormatterGlobal();
 const { successToast, errorToast } = useToast();
 const { t } = useI18n();
diff --git a/src/views/Logs/AuditLogs/AuditLogs.vue b/src/views/Logs/AuditLogs/AuditLogs.vue
index 412df956a6..da3bb00699 100644
--- a/src/views/Logs/AuditLogs/AuditLogs.vue
+++ b/src/views/Logs/AuditLogs/AuditLogs.vue
@@ -140,7 +140,7 @@ import i18n from '@/i18n';
 import IconDownload from '@carbon/icons-vue/es/download/20';
 import IconChevron from '@carbon/icons-vue/es/chevron--down/20';
 import PageTitle from '@/components/Global/PageTitle.vue';
-import { AuditLogsStore } from '@/store/index.js';
+import stores from '@/store/index.js';
 import useTableFilterComposable from '@/components/Composables/useTableFilterComposable';
 import Search from '@/components/Global/Search.vue';
 import usePaginationComposable from '@/components/Composables/usePaginationComposable';
@@ -153,7 +153,7 @@ import eventBus from '@/eventBus';
 
 const { currentPage, perPage, itemsPerPageOptions, getTotalRowCount } =
   usePaginationComposable();
-const auditLogsStore = AuditLogsStore();
+const auditLogsStore = stores.AuditLogsStore();
 const { successToast, infoToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 const { dataFormatter } = useDataFormatterGlobal();
diff --git a/src/views/Logs/DeconfigurationRecords/DeconfigurationRecords.vue b/src/views/Logs/DeconfigurationRecords/DeconfigurationRecords.vue
index e0bcf1a787..b1925a0e54 100644
--- a/src/views/Logs/DeconfigurationRecords/DeconfigurationRecords.vue
+++ b/src/views/Logs/DeconfigurationRecords/DeconfigurationRecords.vue
@@ -231,7 +231,7 @@ import PageTitle from '@/components/Global/PageTitle.vue';
 import TableFilter from '@/components/Global/TableFilter.vue';
 import TableToolbar from '@/components/Global/TableToolbar.vue';
 import TableToolbarExport from '@/components/Global/TableToolbarExport.vue';
-import { DeconfigurationRecordsStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import { onBeforeRouteLeave } from 'vue-router';
 import eventBus from '@/eventBus';
 
@@ -256,8 +256,8 @@ const Toast = useToastComposable();
 const { getFilteredTableData } = useTableFilterComposable();
 const { dataFormatter } = useDataFormatterGlobal();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
-const deconfigurationRecoredsStore = DeconfigurationRecordsStore();
-const global = GlobalStore();
+const deconfigurationRecoredsStore = stores.DeconfigurationRecordsStore();
+const global = stores.GlobalStore();
 
 onBeforeRouteLeave(() => {
   hideLoader();
diff --git a/src/views/Logs/Dumps/Dumps.vue b/src/views/Logs/Dumps/Dumps.vue
index 575c9f13b5..cfb1900845 100644
--- a/src/views/Logs/Dumps/Dumps.vue
+++ b/src/views/Logs/Dumps/Dumps.vue
@@ -194,7 +194,7 @@ import useToast from '@/components/Composables/useToastComposable';
 import usePaginationComposable from '@/components/Composables/usePaginationComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useTableFilterComposable from '@/components/Composables/useTableFilterComposable';
-import { DumpsStore, UserManagementStore, ResourceMemoryStore,  GlobalStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
@@ -202,10 +202,10 @@ const { currentPage, perPage, itemsPerPageOptions, getTotalRowCount } = usePagin
 const { getFilteredTableData, getFilteredTableDataByDate } = useTableFilterComposable();
 const { successToast, errorToast } = useToast();
 
-const dumps = DumpsStore();
-const userManagement = UserManagementStore();
-const resourceMemory = ResourceMemoryStore();
-const global = GlobalStore();
+const dumps = stores.DumpsStore();
+const userManagement = stores.UserManagementStore();
+const resourceMemory = stores.ResourceMemoryStore();
+const global = stores.GlobalStore();
 
 const isBusy = ref(true);
 const selectedDumpType = ref('');
diff --git a/src/views/Logs/Dumps/DumpsForm.vue b/src/views/Logs/Dumps/DumpsForm.vue
index 3fc43f7b18..4715960ca7 100644
--- a/src/views/Logs/Dumps/DumpsForm.vue
+++ b/src/views/Logs/Dumps/DumpsForm.vue
@@ -92,17 +92,17 @@ import InputPasswordToggle from '@/components/Global/InputPasswordToggle.vue';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import useToast from '@/components/Composables/useToastComposable';
 import { useVuelidate } from '@vuelidate/core';
-import { GlobalStore, IBMiServiceFunctionsStore, BootSettingsStore, UserManagementStore, DumpsStore } from '@/store/index.js';
+import stores from '@/store/index.js';
 import eventBus from '@/eventBus';
 
 const { getValidationState } = useVuelidateComposable();
 const { successToast, errorToast, infoToast } = useToast();
 
-const global = GlobalStore();
-const ibmiServiceFunctions = IBMiServiceFunctionsStore();
-const serverBootSettings = BootSettingsStore();
-const userManagement = UserManagementStore();
-const dumps = DumpsStore()
+const global = stores.GlobalStore();
+const ibmiServiceFunctions = stores.IBMiServiceFunctionsStore();
+const serverBootSettings = stores.BootSettingsStore();
+const userManagement = stores.UserManagementStore();
+const dumps = stores.DumpsStore()
 
 const selectedDumpType =  ref('');
 const resourceSelectorValue = ref(null);
diff --git a/src/views/Logs/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue
index 2b87490386..dd30dff00a 100644
--- a/src/views/Logs/EventLogs/EventLogs.vue
+++ b/src/views/Logs/EventLogs/EventLogs.vue
@@ -317,7 +317,7 @@ import useTableRowExpandComposable from "../../../components/Composables/useTabl
 import useSearchFilterComposable from "../../../components/Composables/useSearchFilterComposable";
 import eventBus from '@/eventBus';
 
-import { GlobalStore, EventLogStore } from "../../../store";
+import stores from "../../../store";
 
 export default {
   components: {
@@ -434,10 +434,10 @@ export default {
   },
   computed: {
     currentUser() {
-      return GlobalStore().currentUserGetter;
+      return stores.GlobalStore().currentUserGetter;
     },
     isServiceUser() {
-      return GlobalStore().isServiceUser;
+      return stores.GlobalStore().isServiceUser;
     },
     filteredRows() {
       return this.searchFilter
@@ -445,7 +445,7 @@ export default {
         : this.filteredLogs.length;
     },
     allLogs() {
-      return EventLogStore().eventlogsGetter;
+      return stores.EventLogStore().eventlogsGetter;
     },
     filteredLogsByDate() {
       return useTableFilter().getFilteredTableDataByDate(
@@ -463,17 +463,17 @@ export default {
   },
   created() {
     eventBus.on('clear-selected', () => {
-      EventLogStore().eventlogsGetter?.map((singleLog) => {
+      stores.EventLogStore().eventlogsGetter?.map((singleLog) => {
         singleLog.rowSelected = false;
       });
       useTableSelectableComposable().clearSelectedRowsOptions(this.$refs.table);
     }),
     useLoadingBar().startLoader();
-    EventLogStore().initializeLogs().then(() => {
-      EventLogStore().getEventLogData().finally(() => {
+    stores.EventLogStore().initializeLogs().then(() => {
+      stores.EventLogStore().getEventLogData().finally(() => {
         this.checkForUserData();
         if (this.isServiceUser) {
-          EventLogStore().getCELogData();
+          stores.EventLogStore().getCELogData();
         }
       });
       useLoadingBar().endLoader();
@@ -513,17 +513,17 @@ export default {
     checkForUserData() {
       if (!this.currentUser) {
         // this.$store.dispatch('userManagement/getUsers');
-        GlobalStore().getCurrentUser();
+        stores.GlobalStore().getCurrentUser();
       }
     },
     reloadEventLogData() {
       if (this.isServiceUser) {
-        EventLogStore().getCELogData();
+        stores.EventLogStore().getCELogData();
       }
-      EventLogStore().getEventLogData();
+      stores.EventLogStore().getEventLogData();
     },
     changelogStatus(row) {
-      EventLogStore().updateEventLogStatus({
+      stores.EventLogStore().updateEventLogStatus({
           uri: row.uri,
           status: row.status,
         })
@@ -550,7 +550,7 @@ export default {
     },
     handleOk(value) {
           if (value === 'all') {
-            EventLogStore().deleteAllEventLogs(this.allLogs)
+            stores.EventLogStore().deleteAllEventLogs(this.allLogs)
               .then((message) => {
                 this.reloadEventLogData();
                 this.toast.successToast(message);
@@ -559,7 +559,7 @@ export default {
               .finally(() => this.openModal = false)
           } else {
               if (this.selectedRows.length === this.allLogs.length) {
-                EventLogStore().deleteAllEventLogs(this.selectedRows)
+                stores.EventLogStore().deleteAllEventLogs(this.selectedRows)
                   .then((message) => {
                     this.reloadEventLogData();
                     this.toast.successToast(message);
@@ -572,7 +572,7 @@ export default {
             }
     },
     deleteLogs(uris) {
-      EventLogStore().deleteEventLogs(uris)
+      stores.EventLogStore().deleteEventLogs(uris)
         .then((messages) => {
           messages.forEach(({ type, message }) => {
             this.reloadEventLogData();
@@ -604,7 +604,7 @@ export default {
         //  download single log
         const pelJsonInfo = [];
         useLoadingBar().startLoader();
-        EventLogStore().downloadLogData(uri)
+        stores.EventLogStore().downloadLogData(uri)
           .then((returned) => {
             pelJsonInfo.push(returned);
           })
@@ -637,7 +637,7 @@ export default {
       this.searchTotalFilteredRows = filteredItems.length;
     },
     resolveLogs() {
-      EventLogStore().resolveEventLogs(this.selectedRows)
+      stores.EventLogStore().resolveEventLogs(this.selectedRows)
         .then((messages) => {
           messages.forEach(({ type, message }) => {
             if (type === 'success') {
@@ -651,7 +651,7 @@ export default {
         });
     },
     unresolveLogs() {
-      EventLogStore().unresolveEventLogs(this.selectedRows)
+      stores.EventLogStore().unresolveEventLogs(this.selectedRows)
         .then((messages) => {
           messages.forEach(({ type, message }) => {
             if (type === 'success') {
@@ -672,7 +672,7 @@ export default {
         let counter = 1;
         while (counter <= this.allLogs.length) {
           useLoadingBar().startLoader();
-          await EventLogStore().downloadLogData(this.allLogs[counter - 1].uri)
+          await stores.EventLogStore().downloadLogData(this.allLogs[counter - 1].uri)
             .then((returned) => {
               pelJsonInfo.push(returned);
               counter = counter + 1;
@@ -689,7 +689,7 @@ export default {
         let counter = 1;
         while (counter <= this.selectedRows.length) {
           useLoadingBar().startLoader();
-          await EventLogStore().downloadLogData(this.selectedRows[counter - 1].uri)
+          await stores.EventLogStore().downloadLogData(this.selectedRows[counter - 1].uri)
             .then((returned) => {
               pelJsonInfo.push(returned);
               counter = counter + 1;
@@ -710,7 +710,7 @@ export default {
       return useDataFormatterGlobal().dataFormatter(value);
     },
     toggleAll(checked) {
-      EventLogStore().eventlogsGetter?.map((singleLog) => {
+      stores.EventLogStore().eventlogsGetter?.map((singleLog) => {
         singleLog.rowSelected = checked;
       });
     },
diff --git a/src/views/Logs/IBMiServiceFunctions/IBMiServiceFunctions.vue b/src/views/Logs/IBMiServiceFunctions/IBMiServiceFunctions.vue
index 8a8d5b86e9..7352eb664d 100644
--- a/src/views/Logs/IBMiServiceFunctions/IBMiServiceFunctions.vue
+++ b/src/views/Logs/IBMiServiceFunctions/IBMiServiceFunctions.vue
@@ -188,16 +188,12 @@ import { ref, computed, onBeforeMount } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToast from '@/components/Composables/useToastComposable';
-import {
-  GlobalStore,
-  IBMiServiceFunctionsStore,
-  BootSettingsStore,
-} from '@/store';
+import stores from '@/store';
 import Alert from '@/components/Global/Alert.vue';
 
-const globalStore = GlobalStore();
-const ibmiServiceFunctionsStore = IBMiServiceFunctionsStore();
-const bootSettingsStore = BootSettingsStore();
+const globalStore = stores.GlobalStore();
+const ibmiServiceFunctionsStore = stores.IBMiServiceFunctionsStore();
+const bootSettingsStore = stores.BootSettingsStore();
 const { successToast, errorToast } = useToast();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 
diff --git a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
index 3b8a96ca64..f1e820c797 100644
--- a/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
+++ b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
@@ -153,7 +153,7 @@ import useTableRowExpandComposable from "../../../components/Composables/useTabl
 import useSearchFilterComposable from "../../../components/Composables/useSearchFilterComposable";
 import { ref, onMounted, computed } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
-import { PostCodeLogsStore } from "../../../store";
+import stores from "../../../store";
 
     const {
       clearSelectedRows,
@@ -172,7 +172,7 @@ import { PostCodeLogsStore } from "../../../store";
     const { expandRowLabel } = useTableRowExpandComposable();
     const { errorToast } = useToastComposable();
     const { hideLoader, startLoader, endLoader } = useLoadingBar();
-    const postCodeLogsStore = PostCodeLogsStore();
+    const postCodeLogsStore = stores.PostCodeLogsStore();
     const srcData = ref({});
     const isBusy = ref(true)
     const fields = ref([
diff --git a/src/views/Logs/PostCodeLogs/PostCodes.vue b/src/views/Logs/PostCodeLogs/PostCodes.vue
index d2587f0504..8c097b345a 100644
--- a/src/views/Logs/PostCodeLogs/PostCodes.vue
+++ b/src/views/Logs/PostCodeLogs/PostCodes.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { GlobalStore } from "../../../store";
+import stores from "../../../store";
 export default {
   name: 'PostCodes',
   data() {
@@ -15,7 +15,7 @@ export default {
   },
   computed: {
     postCodeValue() {
-      return GlobalStore().postCodeValueGetter;
+      return stores.GlobalStore().postCodeValueGetter;
     },
     postCodes: {
       get() {
diff --git a/src/views/Operations/FactoryReset/FactoryReset.vue b/src/views/Operations/FactoryReset/FactoryReset.vue
index 77698e16db..584356bfd5 100644
--- a/src/views/Operations/FactoryReset/FactoryReset.vue
+++ b/src/views/Operations/FactoryReset/FactoryReset.vue
@@ -80,12 +80,12 @@ import PageTitle from '@/components/Global/PageTitle.vue';
 import ModalReset from './FactoryResetModal.vue';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToastComposable from '@/components/Composables/useToastComposable';
-import { FactoryResetStore, AuthenticationStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
-const global = GlobalStore();
-const authentication = AuthenticationStore();
-const factoryReset = FactoryResetStore();
+const global = stores.GlobalStore();
+const authentication = stores.AuthenticationStore();
+const factoryReset = stores.FactoryResetStore();
 const toast = useToastComposable();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 const resetOption = ref('resetBios');
diff --git a/src/views/Operations/FactoryReset/FactoryResetModal.vue b/src/views/Operations/FactoryReset/FactoryResetModal.vue
index 81586bda60..d8282fd2d9 100644
--- a/src/views/Operations/FactoryReset/FactoryResetModal.vue
+++ b/src/views/Operations/FactoryReset/FactoryResetModal.vue
@@ -50,7 +50,7 @@
 
 <script setup>
 import { computed, defineProps, ref, defineEmits } from 'vue';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import { useVuelidate } from '@vuelidate/core';
 import i18n from '@/i18n';
@@ -59,7 +59,7 @@ import eventBus from '@/eventBus';
 const messagesEn = i18n.global.getLocaleMessage('en-US');
 const factoryResetMessage = messagesEn?.pageFactoryReset?.modal;
 const { getValidationState } = useVuelidateComposable();
-const global = GlobalStore();
+const global = stores.GlobalStore();
 defineProps({
   resetType: {
     type: String,
diff --git a/src/views/Operations/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue
index 7c0c53d834..2b91511e0c 100644
--- a/src/views/Operations/Firmware/Firmware.vue
+++ b/src/views/Operations/Firmware/Firmware.vue
@@ -64,19 +64,14 @@ import BmcCards from './FirmwareCardsBmc.vue';
 import HostCards from './FirmwareCardsHost.vue';
 import FormUpdate from './FirmwareFormUpdate.vue';
 import FirmwareAccessKey from './FirmwareAccessKey.vue';
-import {
-  GlobalStore,
-  FirmwareStore,
-  ControlStore,
-  LicenseStore,
-} from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
 
-const globalStore = GlobalStore();
-const firmwareStore = FirmwareStore();
-const controlStore = ControlStore();
-const licenseStore = LicenseStore();
+const globalStore = stores.GlobalStore();
+const firmwareStore = stores.FirmwareStore();
+const controlStore = stores.ControlStore();
+const licenseStore = stores.LicenseStore();
 
 const isServerPowerOffRequired = ref(
   import.meta.env.VITE_APP_SERVER_OFF_REQUIRED === 'true',
diff --git a/src/views/Operations/Firmware/FirmwareAccessKey.vue b/src/views/Operations/Firmware/FirmwareAccessKey.vue
index 997987e8be..db4baf90c6 100644
--- a/src/views/Operations/Firmware/FirmwareAccessKey.vue
+++ b/src/views/Operations/Firmware/FirmwareAccessKey.vue
@@ -22,9 +22,9 @@
 
 <script setup>
 import { computed } from 'vue';
-import { LicenseStore } from '@/store';
+import stores from '@/store';
 
-const licenseStore = LicenseStore();
+const licenseStore = stores.LicenseStore();
 
 const firmwareAccessKeyInfo = computed(() => {
   return licenseStore.firmwareAccessKeyInfo;
diff --git a/src/views/Operations/Firmware/FirmwareAlertServerPower.vue b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue
index 996eed4cc6..0e3a37f49b 100644
--- a/src/views/Operations/Firmware/FirmwareAlertServerPower.vue
+++ b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue
@@ -33,9 +33,9 @@
 <script setup>
 import { computed } from 'vue';
 import Alert from '@/components/Global/Alert.vue';
-import { ControlStore } from '@/store';
+import stores from '@/store';
 
-const controlStore = ControlStore();
+const controlStore = stores.ControlStore();
 
 defineProps({
   isServerOff: {
diff --git a/src/views/Operations/Firmware/FirmwareCardsBmc.vue b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
index 392b48709e..3f220b81f3 100644
--- a/src/views/Operations/Firmware/FirmwareCardsBmc.vue
+++ b/src/views/Operations/Firmware/FirmwareCardsBmc.vue
@@ -79,13 +79,13 @@ import PageSection from '@/components/Global/PageSection.vue';
 import ModalSwitchToRunning from './FirmwareModalSwitchToRunning.vue';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
 import IconSwitch from '@carbon/icons-vue/es/arrows--horizontal/20';
-import { GlobalStore, FirmwareStore } from '@/store';
+import stores from '@/store';
 
 const { errorToast, infoToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 
-const globalStore = GlobalStore();
-const firmwareStore = FirmwareStore();
+const globalStore = stores.GlobalStore();
+const firmwareStore = stores.FirmwareStore();
 
 const emit = defineEmits(['loadingStatus']);
 
diff --git a/src/views/Operations/Firmware/FirmwareCardsHost.vue b/src/views/Operations/Firmware/FirmwareCardsHost.vue
index 0b63fe9e62..b8992fbec8 100644
--- a/src/views/Operations/Firmware/FirmwareCardsHost.vue
+++ b/src/views/Operations/Firmware/FirmwareCardsHost.vue
@@ -40,9 +40,9 @@
 import { computed } from 'vue';
 import PageSection from '@/components/Global/PageSection.vue';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
-import { FirmwareStore } from '@/store';
+import stores from '@/store';
 
-const firmwareStore = FirmwareStore();
+const firmwareStore = stores.FirmwareStore();
 
 const running = computed(() => {
   return firmwareStore.activeHostFirmware;
diff --git a/src/views/Operations/Firmware/FirmwareFormUpdate.vue b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
index e3ceb7058d..eb1c089344 100644
--- a/src/views/Operations/Firmware/FirmwareFormUpdate.vue
+++ b/src/views/Operations/Firmware/FirmwareFormUpdate.vue
@@ -95,16 +95,16 @@ import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import IconInfo from '@carbon/icons-vue/es/information/16';
 import FormFile from '@/components/Global/FormFile.vue';
 import ModalUpdateFirmware from './FirmwareModalUpdateFirmware.vue';
-import { GlobalStore, BmcStore, FirmwareStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { errorToast, infoToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 const { getValidationState } = useVuelidateComposable();
 
-const globalStore = GlobalStore();
-const bmcStore = BmcStore();
-const firmwareStore = FirmwareStore();
+const globalStore = stores.GlobalStore();
+const bmcStore = stores.BmcStore();
+const firmwareStore = stores.FirmwareStore();
 
 const emit = defineEmits(['loadingStatus']);
 
diff --git a/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
index 42927a78c9..b1badadc29 100644
--- a/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
+++ b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue
@@ -30,9 +30,9 @@
 <script setup>
 import { ref, computed } from 'vue';
 import eventBus from '@/eventBus';
-import { FirmwareStore } from '@/store';
+import stores from '@/store';
 
-const firmwareStore = FirmwareStore();
+const firmwareStore = stores.FirmwareStore();
 
 const modal = ref(false);
 
diff --git a/src/views/Operations/HostConsole/HostConsoleConsole.vue b/src/views/Operations/HostConsole/HostConsoleConsole.vue
index bc06db9bd7..27e3846c1d 100644
--- a/src/views/Operations/HostConsole/HostConsoleConsole.vue
+++ b/src/views/Operations/HostConsole/HostConsoleConsole.vue
@@ -40,7 +40,7 @@ import { Terminal } from 'xterm';
 import { throttle } from 'lodash';
 import IconLaunch from '@carbon/icons-vue/es/launch/20';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
-import { ChassisStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 
 defineProps({
   isFullWindow: {
@@ -51,8 +51,8 @@ defineProps({
 
 const panel = useTemplateRef('panel');
 
-const chassisStore = ChassisStore();
-const authenticationStore = AuthenticationStore();
+const chassisStore = stores.ChassisStore();
+const authenticationStore = stores.AuthenticationStore();
 
 const checkingServerStatus = ref(null); // used to prevent extra api calls
 const resizeConsoleWindow = ref(null);
diff --git a/src/views/Operations/KeyClear/KeyClear.vue b/src/views/Operations/KeyClear/KeyClear.vue
index 5974f01323..19421c5d5a 100644
--- a/src/views/Operations/KeyClear/KeyClear.vue
+++ b/src/views/Operations/KeyClear/KeyClear.vue
@@ -89,18 +89,18 @@
 
 <script setup>
 import { ref } from 'vue';
-import { GlobalStore, KeyClearStore } from '@/store';
+import stores from '@/store';
 import Alert from '@/components/Global/Alert.vue';
 import PageTitle from '@/components/Global/PageTitle.vue';
 import useToast from '@/components/Composables/useToastComposable';
 
-const globalStore = GlobalStore();
+const globalStore = stores.GlobalStore();
 const keyOption = ref('NONE');
 const username = ref(globalStore.username);
 const openModal = ref(false);
 const selectedKey = ref('');
 
-const keyClear = KeyClearStore();
+const keyClear = stores.KeyClearStore();
 const { successToast, errorToast } = useToast();
 
 function onKeyClearSubmit(valueSelected) {
diff --git a/src/views/Operations/RebootBmc/RebootBmc.vue b/src/views/Operations/RebootBmc/RebootBmc.vue
index 0aad45f18d..778d096284 100644
--- a/src/views/Operations/RebootBmc/RebootBmc.vue
+++ b/src/views/Operations/RebootBmc/RebootBmc.vue
@@ -61,7 +61,7 @@ import { ref, computed, onBeforeMount } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToast from '@/components/Composables/useToastComposable';
-import { ControlStore, BootSettingsStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
@@ -72,8 +72,8 @@ onBeforeRouteLeave(() => {
 
 const openModal = ref(false);
 
-const controlStore = ControlStore();
-const bootSettingsStore = BootSettingsStore();
+const controlStore = stores.ControlStore();
+const bootSettingsStore = stores.BootSettingsStore();
 
 const lastBmcRebootTime = computed(() => {
   return controlStore.getLastBmcRebootTime;
diff --git a/src/views/Operations/ServerPowerOperations/BiosSettings.vue b/src/views/Operations/ServerPowerOperations/BiosSettings.vue
index 68dab4df7c..070b0aaed6 100644
--- a/src/views/Operations/ServerPowerOperations/BiosSettings.vue
+++ b/src/views/Operations/ServerPowerOperations/BiosSettings.vue
@@ -510,11 +510,11 @@ import { ref, computed, onBeforeMount, watch } from 'vue';
 import i18n from '@/i18n';
 import Alert from '@/components/Global/Alert.vue';
 import IconChevron from '@carbon/icons-vue/es/chevron--up/20';
-import { GlobalStore, BootSettingsStore, ResourceMemoryStore } from '@/store';
+import stores from '@/store';
 
-const globalStore = GlobalStore();
-const bootSettingsStore = BootSettingsStore();
-const resourceMemoryStore = ResourceMemoryStore();
+const globalStore = stores.GlobalStore();
+const bootSettingsStore = stores.BootSettingsStore();
+const resourceMemoryStore = stores.ResourceMemoryStore();
 
 defineProps({
   attributeValues: {
diff --git a/src/views/Operations/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue
index d4c0c55fca..1eea208499 100644
--- a/src/views/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/Operations/ServerPowerOperations/BootSettings.vue
@@ -33,14 +33,14 @@ import i18n from '@/i18n';
 import BiosSettings from './BiosSettings.vue';
 import useToast from '@/components/Composables/useToastComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
-import { GlobalStore, BootSettingsStore, ResourceMemoryStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader } = useLoadingBar();
 const { successToast, infoToast, errorToast } = useToast();
 
-const globalStore = GlobalStore();
-const bootSettingsStore = BootSettingsStore();
-const resourceMemoryStore = ResourceMemoryStore();
+const globalStore = stores.GlobalStore();
+const bootSettingsStore = stores.BootSettingsStore();
+const resourceMemoryStore = stores.ResourceMemoryStore();
 
 const props = defineProps({
   isInPhypStandby: {
diff --git a/src/views/Operations/ServerPowerOperations/NetworkSettingsModal.vue b/src/views/Operations/ServerPowerOperations/NetworkSettingsModal.vue
index bc001b0a82..70dcf748e5 100644
--- a/src/views/Operations/ServerPowerOperations/NetworkSettingsModal.vue
+++ b/src/views/Operations/ServerPowerOperations/NetworkSettingsModal.vue
@@ -323,11 +323,11 @@ import useToast from '@/components/Composables/useToastComposable';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import { NETWORK_OBJECT } from '@/utilities/NetworkSettingsObject.js';
 import { REGEX_MAPPINGS } from '@/utilities/GlobalConstants.js';
-import { NetworkSettingsStore } from '@/store';
+import stores from '@/store';
 
 const { getValidationState } = useVuelidateComposable();
 
-const networkSettingsStore = NetworkSettingsStore();
+const networkSettingsStore = stores.NetworkSettingsStore();
 
 const { successToast, errorToast } = useToast();
 
diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
index 4657360c1d..c8653f2793 100644
--- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
+++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue
@@ -247,22 +247,16 @@ import Alert from '@/components/Global/Alert.vue';
 import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
 import NetworkSettingsModal from './NetworkSettingsModal.vue';
 
-import {
-  GlobalStore,
-  ControlStore,
-  BmcStore,
-  BootSettingsStore,
-  ResourceMemoryStore,
-} from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
 const { successToast, infoToast, errorToast } = useToast();
 
-const globalStore = GlobalStore();
-const controlStore = ControlStore();
-const bmcStore = BmcStore();
-const bootSettingsStore = BootSettingsStore();
-const resourceMemoryStore = ResourceMemoryStore();
+const globalStore = stores.GlobalStore();
+const controlStore = stores.ControlStore();
+const bmcStore = stores.BmcStore();
+const bootSettingsStore = stores.BootSettingsStore();
+const resourceMemoryStore = stores.ResourceMemoryStore();
 
 const openModal = ref(false);
 
diff --git a/src/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles.vue b/src/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles.vue
index 7bc2881457..d1cedfb300 100644
--- a/src/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles.vue
+++ b/src/views/Operations/ServiceLoginConsoles/ServiceLoginConsoles.vue
@@ -44,7 +44,7 @@ import { Terminal } from 'xterm';
 import { throttle } from 'lodash';
 import IconLaunch from '@carbon/icons-vue/es/launch/20';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
-import { GlobalStore, ChassisStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 
 const props = defineProps({
   isFullWindow: {
@@ -57,9 +57,9 @@ const props = defineProps({
   },
 });
 
-const chassisStore = ChassisStore();
-const authenticationStore = AuthenticationStore();
-const globalStore = GlobalStore();
+const chassisStore = stores.ChassisStore();
+const authenticationStore = stores.AuthenticationStore();
+const globalStore = stores.GlobalStore();
 
 const panel = useTemplateRef('panel');
 
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 9b5b43892c..1a25b8621b 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -38,12 +38,12 @@ import OverviewPower from './OverviewPower.vue';
 import OverviewEvents from './OverviewEvents.vue';
 import OverviewInventory from './OverviewInventory.vue';
 import OverviewDumps from './OverviewDumps.vue';
-import { UserManagementStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { startLoader, endLoader } = useLoadingBar();
 
-const userManagementStore = UserManagementStore();
+const userManagementStore = stores.UserManagementStore();
 
 const showDumps = ref(import.meta.env.VITE_APP_ENV_NAME === 'ibm');
 
diff --git a/src/views/Overview/OverviewDumps.vue b/src/views/Overview/OverviewDumps.vue
index 983cfa7dce..abd80018dd 100644
--- a/src/views/Overview/OverviewDumps.vue
+++ b/src/views/Overview/OverviewDumps.vue
@@ -20,12 +20,12 @@
 import { computed, onBeforeMount } from 'vue';
 import OverviewCard from './OverviewCard.vue';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
-import { DumpsStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const dumpsStore = DumpsStore();
+const dumpsStore = stores.DumpsStore();
 
 onBeforeMount(() => {
       dumpsStore.getAllDumps().finally(() => {
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index a15d2564cc..f7ecfeacd0 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -35,12 +35,12 @@ import OverviewCard from './OverviewCard.vue';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
 import { computed, onBeforeMount } from 'vue';
-import { EventLogStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const eventLogStore = EventLogStore();
+const eventLogStore = stores.EventLogStore();
 
 onBeforeMount(() => {
   eventLogStore.getEventLogData().finally(() => {
diff --git a/src/views/Overview/OverviewFirmware.vue b/src/views/Overview/OverviewFirmware.vue
index d67c0fbcf5..d9e814eff2 100644
--- a/src/views/Overview/OverviewFirmware.vue
+++ b/src/views/Overview/OverviewFirmware.vue
@@ -27,13 +27,13 @@
 import { computed, onBeforeMount } from 'vue';
 import OverviewCard from './OverviewCard.vue';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
-import { FirmwareStore, LicenseStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const firmwareStore = FirmwareStore();
-const licenseStore = LicenseStore();
+const firmwareStore = stores.FirmwareStore();
+const licenseStore = stores.LicenseStore();
 
 onBeforeMount(() => {
     Promise.all([
diff --git a/src/views/Overview/OverviewInventory.vue b/src/views/Overview/OverviewInventory.vue
index 971624fe41..9a6c2fbcb5 100644
--- a/src/views/Overview/OverviewInventory.vue
+++ b/src/views/Overview/OverviewInventory.vue
@@ -31,12 +31,12 @@
 import { computed, onBeforeMount } from 'vue';
 import OverviewCard from './OverviewCard.vue';
 import useToast from '@/components/Composables/useToastComposable';
-import { SystemStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { successToast, errorToast } = useToast();
 
-const systemStore = SystemStore();
+const systemStore = stores.SystemStore();
 
 onBeforeMount(() => {
   systemStore.getSystem().finally(() => {
diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue
index 6589d87987..99c7230c64 100644
--- a/src/views/Overview/OverviewNetwork.vue
+++ b/src/views/Overview/OverviewNetwork.vue
@@ -43,12 +43,12 @@
 import { computed, onBeforeMount } from 'vue';
 import OverviewCard from './OverviewCard.vue';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 onBeforeMount(() => {
     networkStore?.getEthernetData().finally(() => {
diff --git a/src/views/Overview/OverviewPower.vue b/src/views/Overview/OverviewPower.vue
index 82d3496b53..3721fa2fb8 100644
--- a/src/views/Overview/OverviewPower.vue
+++ b/src/views/Overview/OverviewPower.vue
@@ -48,11 +48,11 @@
 <script setup>
 import { computed, onBeforeMount } from 'vue';
 import OverviewCard from './OverviewCard.vue';
-import { PowerControlStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
-const powerControlStore = PowerControlStore();
-const global = GlobalStore();
+const powerControlStore = stores.PowerControlStore();
+const global = stores.GlobalStore();
 
 onBeforeMount(() => {
     Promise.all([
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 99c969c6e7..b7f159fb00 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -28,13 +28,13 @@
 
 <script setup>
 import { computed, onBeforeMount } from 'vue';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
 import eventBus from '@/eventBus';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const global = GlobalStore();
+const global = stores.GlobalStore();
 
 onBeforeMount(() => {
     Promise.all([global.getBmcTime(), global.getCurrentUser()]).finally(() => {
diff --git a/src/views/Overview/OverviewServer.vue b/src/views/Overview/OverviewServer.vue
index d8b734fe8f..bfd61e3d9f 100644
--- a/src/views/Overview/OverviewServer.vue
+++ b/src/views/Overview/OverviewServer.vue
@@ -52,7 +52,7 @@ import useLoadingBar, { loading } from '@/components/Composables/useLoadingBarCo
 import StatusIcon from '@/components/Global/StatusIcon.vue';
 import IconEdit from '@carbon/icons-vue/es/edit/16';
 import { onBeforeRouteLeave } from 'vue-router';
-import { SystemStore, GlobalStore, BootSettingsStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 import ModalAssetTag from './ModalAssetTag.vue';
 
@@ -60,9 +60,9 @@ const { startLoader, endLoader, hideLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 const { dataFormatter } = useDataFormatterGlobal();
 
-const systemStore = SystemStore();
-const global = GlobalStore();
-const bootSettingsStore = BootSettingsStore();
+const systemStore = stores.SystemStore();
+const global = stores.GlobalStore();
+const bootSettingsStore = stores.BootSettingsStore();
 
 const openModal = ref(false);
 const serviceLoginStatus = ref(null);
diff --git a/src/views/ProfileSettings/ProfileSettings.vue b/src/views/ProfileSettings/ProfileSettings.vue
index d92406e3e8..ef961a2163 100644
--- a/src/views/ProfileSettings/ProfileSettings.vue
+++ b/src/views/ProfileSettings/ProfileSettings.vue
@@ -147,7 +147,7 @@ import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useLocalTimezoneLabelComposable from '../../components/Composables/useLocalTimezoneLabelComposable';
 import PageTitle from '@/components/Global/PageTitle.vue';
 import PageSection from '@/components/Global/PageSection.vue';
-import { UserManagementStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import {
   minLength,
   maxLength,
@@ -159,8 +159,8 @@ const { getValidationState } = useVuelidateComposable();
 const { startLoader, endLoader } = useLoadingBar();
 const { localOffset } = useLocalTimezoneLabelComposable();
 
-const global = GlobalStore();
-const userManagementStore = UserManagementStore()
+const global = stores.GlobalStore();
+const userManagementStore = stores.UserManagementStore()
 
 const form = ref({
         newPassword: '',
diff --git a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemand.vue b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemand.vue
index 67a668514b..5a7bc6abcf 100644
--- a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemand.vue
+++ b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemand.vue
@@ -51,13 +51,13 @@ import { onBeforeRouteLeave } from 'vue-router';
 import CapacityOnDemandOrderInfo from './CapacityOnDemandOrderInfo.vue';
 import CapacityOnDemandAcvitation from './CapacityOnDemandActivation.vue';
 import CapacityOnDemandTable from './CapacityOnDemandTable.vue';
-import { LicenseStore, GlobalStore, SystemStore } from '@/store';
+import stores from '@/store';
 
 const { scrollToOffset } = useJumpLinkComposable();
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
-const global = GlobalStore();
-const licenseStore = LicenseStore();
-const systemStore = SystemStore();
+const global = stores.GlobalStore();
+const licenseStore = stores.LicenseStore();
+const systemStore = stores.SystemStore();
 
 const activation = ref(null);
 const orderInfo = ref(null);
diff --git a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandActivation.vue b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandActivation.vue
index 429aed30e0..215b702a20 100644
--- a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandActivation.vue
+++ b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandActivation.vue
@@ -77,13 +77,13 @@ import useVuelidateComposable from '@/components/Composables/useVuelidateComposa
 import useToast from '@/components/Composables/useToastComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import { useVuelidate } from '@vuelidate/core';
-import { LicenseStore, GlobalStore } from '@/store';
+import stores from '@/store';
 
 const { getValidationState } = useVuelidateComposable();
 const { successToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
-const global = GlobalStore();
-const licenseStore = LicenseStore();
+const global = stores.GlobalStore();
+const licenseStore = stores.LicenseStore();
 
 const licenseKey = ref('');
 const maxLengthVal = ref(34);
diff --git a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandOrderInfo.vue b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandOrderInfo.vue
index d907ea31db..0e754ff9a0 100644
--- a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandOrderInfo.vue
+++ b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandOrderInfo.vue
@@ -171,10 +171,10 @@
 import { computed } from 'vue';
 import PageSection from '@/components/Global/PageSection.vue';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
-import { LicenseStore, SystemStore } from '@/store';
+import stores from '@/store';
 
-const licenseStore = LicenseStore();
-const systemStore = SystemStore();
+const licenseStore = stores.LicenseStore();
+const systemStore = stores.SystemStore();
 const { dataFormatter } = useDataFormatterGlobal();
 
 const processorInfo = computed(() => {
diff --git a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandTable.vue b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandTable.vue
index ce701f94de..68b5b71f8e 100644
--- a/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandTable.vue
+++ b/src/views/ResourceManagement/CapacityOnDemand/CapacityOnDemandTable.vue
@@ -162,8 +162,8 @@ import i18n from '@/i18n';
 import { forOwn } from 'lodash';
 import PageSection from '@/components/Global/PageSection.vue';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
-import { LicenseStore } from '@/store';
-const licenseStore = LicenseStore();
+import stores from '@/store';
+const licenseStore = stores.LicenseStore();
 
 const fields = ref([
         {
diff --git a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverride.vue b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverride.vue
index c6502180f5..79d3f792c3 100644
--- a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverride.vue
+++ b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverride.vue
@@ -28,15 +28,15 @@ import { onBeforeRouteLeave } from 'vue-router';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import PageTitle from '@/components/Global/PageTitle.vue';
 import Alert from '@/components/Global/Alert.vue';
-import { SystemStore, FieldCoreOverrideStore, LicenseStore } from '@/store';
+import stores from '@/store';
 import CurrentConfiguration from './FieldCoreOverrideInfo.vue';
 import ChangeConfiguration from './FieldCoreOverrideConfiguration.vue';
 
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
 
-const systemStore = SystemStore();
-const fieldCoreOverrideStore = FieldCoreOverrideStore();
-const licenseStore = LicenseStore();
+const systemStore = stores.SystemStore();
+const fieldCoreOverrideStore = stores.FieldCoreOverrideStore();
+const licenseStore = stores.LicenseStore();
 
 onBeforeMount(() => {
   startLoader();
diff --git a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideConfiguration.vue b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideConfiguration.vue
index 6614fac8b2..a82c67ba24 100644
--- a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideConfiguration.vue
+++ b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideConfiguration.vue
@@ -57,14 +57,14 @@ import { requiredIf, minValue } from '@vuelidate/validators';
 import useToast from '@/components/Composables/useToastComposable';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import PageSection from '@/components/Global/PageSection.vue';
-import { SystemStore, FieldCoreOverrideStore, LicenseStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { getValidationState } = useVuelidateComposable();
 
-const systemStore = SystemStore();
-const fieldCoreOverrideStore = FieldCoreOverrideStore();
-const licenseStore = LicenseStore();
+const systemStore = stores.SystemStore();
+const fieldCoreOverrideStore = stores.FieldCoreOverrideStore();
+const licenseStore = stores.LicenseStore();
 
 const inputEnableFieldCoreOverride = ref(
   fieldCoreOverrideStore.isEnabledGetter
diff --git a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideInfo.vue b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideInfo.vue
index 1233435de7..29ff84fc26 100644
--- a/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideInfo.vue
+++ b/src/views/ResourceManagement/FieldCoreOverride/FieldCoreOverrideInfo.vue
@@ -35,11 +35,11 @@ import { isUndefined } from 'lodash';
 import IconTime from '@carbon/icons-vue/es/time/16';
 import PageSection from '@/components/Global/PageSection.vue';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
-import { SystemStore, FieldCoreOverrideStore, LicenseStore } from '@/store';
+import stores from '@/store';
 
-const systemStore = SystemStore();
-const fieldCoreOverrideStore = FieldCoreOverrideStore();
-const licenseStore = LicenseStore();
+const systemStore = stores.SystemStore();
+const fieldCoreOverrideStore = stores.FieldCoreOverrideStore();
+const licenseStore = stores.LicenseStore();
 
 const systems = computed(() => {
   return systemStore.getSystems;
diff --git a/src/views/ResourceManagement/Memory/Memory.vue b/src/views/ResourceManagement/Memory/Memory.vue
index 693ebc192c..95e2500963 100644
--- a/src/views/ResourceManagement/Memory/Memory.vue
+++ b/src/views/ResourceManagement/Memory/Memory.vue
@@ -383,15 +383,15 @@ import Alert from '@/components/Global/Alert.vue';
 import { default as IconJumpLink } from '@carbon/icons-vue/es/jump-link/16';
 import PageTitle from '@/components/Global/PageTitle.vue';
 import PageSection from '@/components/Global/PageSection.vue';
-import { GlobalStore, ResourceMemoryStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader } = useLoadingBar();
 const { scrollToOffset } = useJumpLinkComposable();
 const { successToast, errorToast } = useToast();
 const { getValidationState } = useVuelidateComposable();
 
-const globalStore = GlobalStore();
-const resourceMemoryStore = ResourceMemoryStore();
+const globalStore = stores.GlobalStore();
+const resourceMemoryStore = stores.ResourceMemoryStore();
 
 const logicalMemorySizeOption = ref(null);
 const inputSystemMemoryPageSetup = ref(null);
diff --git a/src/views/ResourceManagement/Power/Power.vue b/src/views/ResourceManagement/Power/Power.vue
index c9f2620b33..b932b23ded 100644
--- a/src/views/ResourceManagement/Power/Power.vue
+++ b/src/views/ResourceManagement/Power/Power.vue
@@ -40,11 +40,11 @@ import Alert from '@/components/Global/Alert.vue';
 import PowerCap from './PowerCap.vue';
 import PowerPerformanceModes from './PowerPerformanceModes.vue';
 import PowerIdleSaver from './PowerIdleSaver.vue';
-import { GlobalStore } from '@/store';
+import stores from '@/store';
 
 const { hideLoader } = useLoadingBar();
 
-const globalStore = GlobalStore();
+const globalStore = stores.GlobalStore();
 
 const safeMode = computed(() => {
   return globalStore.safeModeGetter;
diff --git a/src/views/ResourceManagement/Power/PowerCap.vue b/src/views/ResourceManagement/Power/PowerCap.vue
index 984a97d244..3e4c1cea57 100644
--- a/src/views/ResourceManagement/Power/PowerCap.vue
+++ b/src/views/ResourceManagement/Power/PowerCap.vue
@@ -106,14 +106,14 @@ import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlo
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import PageSection from '@/components/Global/PageSection.vue';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
-import { PowerControlStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 const { dataFormatter } = useDataFormatterGlobal();
 const { getValidationState } = useVuelidateComposable();
 
-const powerControlStore = PowerControlStore();
+const powerControlStore = stores.PowerControlStore();
 
 defineProps({
   safeMode: {
diff --git a/src/views/ResourceManagement/Power/PowerIdleSaver.vue b/src/views/ResourceManagement/Power/PowerIdleSaver.vue
index 0277d0ba00..70a472c656 100644
--- a/src/views/ResourceManagement/Power/PowerIdleSaver.vue
+++ b/src/views/ResourceManagement/Power/PowerIdleSaver.vue
@@ -189,13 +189,13 @@ import useLoadingBar, {
 import useToast from '@/components/Composables/useToastComposable';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import PageSection from '@/components/Global/PageSection.vue';
-import { PowerControlStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 const { getValidationState } = useVuelidateComposable();
 
-const powerControlStore = PowerControlStore();
+const powerControlStore = stores.PowerControlStore();
 
 defineProps({
   safeMode: {
diff --git a/src/views/ResourceManagement/Power/PowerPerformanceModes.vue b/src/views/ResourceManagement/Power/PowerPerformanceModes.vue
index da62a61930..d7acc60734 100644
--- a/src/views/ResourceManagement/Power/PowerPerformanceModes.vue
+++ b/src/views/ResourceManagement/Power/PowerPerformanceModes.vue
@@ -64,12 +64,12 @@ import PageSection from '@/components/Global/PageSection.vue';
 import IconChevron from '@carbon/icons-vue/es/chevron--up/20';
 import ModalPowerPerformanceModes from './ModalPowerPerformanceModes.vue';
 import TablePowerPerformanceModes from './TablePowerPerformanceModes.vue';
-import { PowerControlStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 
-const powerControlStore = PowerControlStore();
+const powerControlStore = stores.PowerControlStore();
 
 defineProps({
   safeMode: {
diff --git a/src/views/ResourceManagement/SystemParameters/AggressivePrefetch.vue b/src/views/ResourceManagement/SystemParameters/AggressivePrefetch.vue
index 8eeb3e748b..2607b35101 100644
--- a/src/views/ResourceManagement/SystemParameters/AggressivePrefetch.vue
+++ b/src/views/ResourceManagement/SystemParameters/AggressivePrefetch.vue
@@ -31,9 +31,9 @@
 import { computed, defineProps } from 'vue';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import useToastComposable from '@/components/Composables/useToastComposable';
-import { SystemParametersStore } from '@/store';
+import stores from '@/store';
 const Toast = useToastComposable();
-const systemParametersStore = SystemParametersStore();
+const systemParametersStore = stores.SystemParametersStore();
 
 defineProps({
   safeMode: {
diff --git a/src/views/ResourceManagement/SystemParameters/FrequencyCap.vue b/src/views/ResourceManagement/SystemParameters/FrequencyCap.vue
index da4c8f899f..8153063326 100644
--- a/src/views/ResourceManagement/SystemParameters/FrequencyCap.vue
+++ b/src/views/ResourceManagement/SystemParameters/FrequencyCap.vue
@@ -93,7 +93,7 @@
 <script setup>
 import { computed, defineProps, ref, onBeforeMount } from 'vue';
 import { requiredIf, between, numeric } from '@vuelidate/validators';
-import { SystemParametersStore } from '@/store';
+import stores from '@/store';
 import { useVuelidate } from '@vuelidate/core';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
@@ -105,7 +105,7 @@ const { startLoader, endLoader } = useLoadingBar();
 const Toast = useToastComposable();
 const { dataFormatter } = useDataFormatterGlobal();
 const { getValidationState } = useVuelidateComposable();
-const systemParametersStore = SystemParametersStore();
+const systemParametersStore = stores.SystemParametersStore();
 
 defineProps({
   safeMode: {
diff --git a/src/views/ResourceManagement/SystemParameters/LateralCastOut.vue b/src/views/ResourceManagement/SystemParameters/LateralCastOut.vue
index f3ba8dba2c..8c77c6ba43 100644
--- a/src/views/ResourceManagement/SystemParameters/LateralCastOut.vue
+++ b/src/views/ResourceManagement/SystemParameters/LateralCastOut.vue
@@ -31,10 +31,10 @@
 
 <script setup>
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
-import { SystemParametersStore } from '@/store';
+import stores from '@/store';
 import { computed, defineProps } from 'vue';
 import useToastComposable from '@/components/Composables/useToastComposable';
-const systemParametersStore = SystemParametersStore();
+const systemParametersStore = stores.SystemParametersStore();
 const Toast = useToastComposable();
 
 defineProps({
diff --git a/src/views/ResourceManagement/SystemParameters/RuntimeProcessorDiagnostic.vue b/src/views/ResourceManagement/SystemParameters/RuntimeProcessorDiagnostic.vue
index 1f04dc285a..938301e3d7 100644
--- a/src/views/ResourceManagement/SystemParameters/RuntimeProcessorDiagnostic.vue
+++ b/src/views/ResourceManagement/SystemParameters/RuntimeProcessorDiagnostic.vue
@@ -206,7 +206,7 @@ import { computed, defineProps, watch } from 'vue';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import useToastComposable from '@/components/Composables/useToastComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
-import { SystemParametersStore } from '@/store';
+import stores from '@/store';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import { useVuelidate } from '@vuelidate/core';
 import { helpers } from '@vuelidate/validators';
@@ -214,7 +214,7 @@ import { minValue, maxValue } from '@vuelidate/validators';
 import i18n from '@/i18n';
 const { getValidationState } = useVuelidateComposable();
 const Toast = useToastComposable();
-const systemParametersStore = SystemParametersStore();
+const systemParametersStore = stores.SystemParametersStore();
 const { startLoader, endLoader } = useLoadingBar();
 
 const isoTimeRegex = /^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/;
diff --git a/src/views/ResourceManagement/SystemParameters/SystemParameters.vue b/src/views/ResourceManagement/SystemParameters/SystemParameters.vue
index bdace43d24..68648a46de 100644
--- a/src/views/ResourceManagement/SystemParameters/SystemParameters.vue
+++ b/src/views/ResourceManagement/SystemParameters/SystemParameters.vue
@@ -19,11 +19,11 @@ import FrequencyCap from './FrequencyCap.vue';
 import AggressivePrefetch from './AggressivePrefetch.vue';
 import RuntimeProcessorDiagnostic from './RuntimeProcessorDiagnostic.vue';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
-import { SystemParametersStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import { onBeforeMount, computed } from 'vue';
 const { startLoader, endLoader } = useLoadingBar();
-const systemParametersStore = SystemParametersStore();
-const global = GlobalStore();
+const systemParametersStore = stores.SystemParametersStore();
+const global = stores.GlobalStore();
 
 const serverStatus = computed(() => {
   return global.serverStatus;
diff --git a/src/views/SecurityAndAccess/Certificates/Certificates.vue b/src/views/SecurityAndAccess/Certificates/Certificates.vue
index 4cdf29e62b..8c543f4fa4 100644
--- a/src/views/SecurityAndAccess/Certificates/Certificates.vue
+++ b/src/views/SecurityAndAccess/Certificates/Certificates.vue
@@ -142,16 +142,16 @@ import PageTitle from '@/components/Global/PageTitle.vue';
 import TableRowAction from '@/components/Global/TableRowAction.vue';
 import StatusIcon from '@/components/Global/StatusIcon.vue';
 import Alert from '@/components/Global/Alert.vue';
-import { CertificatesStore, UserManagementStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import { ref, onMounted, computed } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToastComposable from '@/components/Composables/useToastComposable';
 import i18n from '@/i18n';
 import eventBus from '@/eventBus';
-const certificate = CertificatesStore();
-const userManagement = UserManagementStore();
-const global = GlobalStore();
+const certificate = stores.CertificatesStore();
+const userManagement = stores.UserManagementStore();
+const global = stores.GlobalStore();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 const toast = useToastComposable();
 const modal = ref(false);
diff --git a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index 50cdbf58af..4711ba8c17 100644
--- a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -351,7 +351,7 @@ import { ref, computed } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
 
 import { required, requiredIf } from '@vuelidate/validators';
-import { CertificatesStore } from '@/store';
+import stores from '@/store';
 
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 
@@ -365,7 +365,7 @@ const { errorToast } = useToast();
 
 const { getValidationState } = useVuelidateComposable();
 const openCsrModal = ref(false);
-const uploadCertificate = CertificatesStore();
+const uploadCertificate = stores.CertificatesStore();
 const initialFormState = {
   certificateType: null,
   country: null,
diff --git a/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue b/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
index 45eb08a96d..e196b12a26 100644
--- a/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
+++ b/src/views/SecurityAndAccess/Certificates/ModalUploadCertificate.vue
@@ -81,13 +81,13 @@
 import { required, requiredIf } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
 import { computed, defineProps, reactive, ref, watch, defineEmits } from 'vue';
-import { CertificatesStore } from '@/store';
+import stores from '@/store';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import FormFile from '@/components/Global/FormFile.vue';
 import eventBus from '@/eventBus';
 
 const { getValidationState } = useVuelidateComposable();
-const uploadCertificate = CertificatesStore();
+const uploadCertificate = stores.CertificatesStore();
 const props = defineProps({
   certificate: {
     type: Object,
diff --git a/src/views/SecurityAndAccess/Ldap/Ldap.vue b/src/views/SecurityAndAccess/Ldap/Ldap.vue
index 38d3f0d7d6..266c2b35de 100644
--- a/src/views/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/SecurityAndAccess/Ldap/Ldap.vue
@@ -245,8 +245,7 @@ import PageTitle from '@/components/Global/PageTitle.vue';
 import PageSection from '@/components/Global/PageSection.vue';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
 import TableRoleGroups from './TableRoleGroups.vue';
-import { LdapStore } from '../../../store';
-import { CertificatesStore } from '../../../store';
+import stores from '../../../store';
 import { onBeforeMount, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import useLoadingBar from '../../../components/Composables/useLoadingBarComposable';
@@ -258,8 +257,8 @@ import useToast from '@/components/Composables/useToastComposable';
 const { t } = useI18n();
 const isPasswordVisible = ref(false);
 const inputType=ref('password')
-const ldapStore = LdapStore();
-const certificatesStore = CertificatesStore();
+const ldapStore = stores.LdapStore();
+const certificatesStore = stores.CertificatesStore();
 const { getValidationState } = useVuelidateComposable();
 const { hideLoader, startLoader, endLoader, loading } = useLoadingBar();
 const { successToast, errorToast } = useToast();
diff --git a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
index 91c1b2dea3..e1c1e165fd 100644
--- a/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
+++ b/src/views/SecurityAndAccess/Ldap/ModalAddRoleGroup.vue
@@ -73,14 +73,14 @@
 <script setup>
 import { computed, ref, reactive, watch,nextTick } from 'vue';
 import { required, requiredIf } from '@vuelidate/validators';
-import { UserManagementStore } from '../../../store';
+import stores from '../../../store';
 import useVuelidate from '@vuelidate/core';
 import eventBus from '@/eventBus';
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import useLoadingBar from '../../../components/Composables/useLoadingBarComposable';
 // import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
 
-const userManagementStore = UserManagementStore();
+const userManagementStore = stores.UserManagementStore();
 const { getValidationState } = useVuelidateComposable();
 const { hideLoader, startLoader, endLoader, loading } = useLoadingBar();
 const modal = ref(false);
diff --git a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
index b4cc0763c7..1ad18ce0f0 100644
--- a/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
+++ b/src/views/SecurityAndAccess/Ldap/TableRoleGroups.vue
@@ -143,10 +143,9 @@ import TableRowAction from '@/components/Global/TableRowAction.vue';
 import ModalAddRoleGroup from './ModalAddRoleGroup.vue';
 import { onBeforeMount, onMounted, reactive } from 'vue';
 import useTableSelectableComposable from '../../../components/Composables/useTableSelectableComposable';
-import { LdapStore } from '../../../store';
+import stores from '../../../store';
 import { computed, ref } from 'vue';
 import i18n from '@/i18n';
-import { UserManagementStore } from '../../../store';
 import eventBus from '@/eventBus';
 import useLoadingBar from '../../../components/Composables/useLoadingBarComposable';
 import useToast from '@/components/Composables/useToastComposable';
@@ -157,10 +156,10 @@ const modal = ref(false);
 const deleteModal = ref(false);
 const deleteModalContent = ref('');
 const batchModal = ref(false);
-const ldapStore = LdapStore();
+const ldapStore = stores.LdapStore();
 const tableRef = ref(null);
 const isAllSelected = ref(false);
-const userManagementStore = UserManagementStore();
+const userManagementStore = stores.UserManagementStore();
 const selectedRowsNo = ref(0);
 const count = ref(0);
 const {
diff --git a/src/views/SecurityAndAccess/Sessions/Sessions.vue b/src/views/SecurityAndAccess/Sessions/Sessions.vue
index 144cc94b01..523d83c913 100644
--- a/src/views/SecurityAndAccess/Sessions/Sessions.vue
+++ b/src/views/SecurityAndAccess/Sessions/Sessions.vue
@@ -149,7 +149,7 @@
 
 <script setup>
 import { ref, onMounted, computed, onBeforeMount } from 'vue';
-import { SessionsStore } from '@/store';
+import stores from '@/store';
 import { onBeforeRouteLeave } from 'vue-router';
 import i18n from '@/i18n';
 import eventBus from '@/eventBus';
@@ -175,7 +175,7 @@ const {
   tableHeaderCheckboxModel,
   tableHeaderCheckboxIndeterminate,
 } = useTableSelectableComposable();
-const sessionsStore = SessionsStore();
+const sessionsStore = stores.SessionsStore();
 const Toast = useToastComposable();
 const tableSessionsRef = ref(null);
 const isBusy = ref(true);
diff --git a/src/views/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
index 1600316113..fc56658939 100644
--- a/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
+++ b/src/views/SecurityAndAccess/UserManagement/ModalUser.vue
@@ -228,7 +228,7 @@ import useVuelidateComposable from '@/components/Composables/useVuelidateComposa
 import InfoTooltipPassword from '@/components/Global/InfoTooltipPassword.vue';
 import InputPasswordToggle from '@/components/Global/InputPasswordToggle.vue';
 import Alert from '@/components/Global/Alert.vue';
-import { GlobalStore, UserManagementStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 
 const { getValidationState } = useVuelidateComposable();
@@ -243,8 +243,8 @@ const { getValidationState } = useVuelidateComposable();
     },
 });
 
-const globalStore = GlobalStore();
-const userManagementStore = UserManagementStore();
+const globalStore = stores.GlobalStore();
+const userManagementStore = stores.UserManagementStore();
 
   const modal = ref(false);
   eventBus.on('modal-user', () => {
diff --git a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
index 3dee4581e3..722e7ceb6d 100644
--- a/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
+++ b/src/views/SecurityAndAccess/UserManagement/UserManagement.vue
@@ -146,7 +146,7 @@ import TableRowAction from '@/components/Global/TableRowAction.vue';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useTableSelectableComposable from '@/components/Composables/useTableSelectableComposable';
 import useToastComposable from '@/components/Composables/useToastComposable';
-import { UserManagementStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
 
 onBeforeRouteLeave(() => {
@@ -163,8 +163,8 @@ onBeforeRouteLeave(() => {
         tableHeaderCheckboxIndeterminate,
       } = useTableSelectableComposable();
 
-      const userManagement = UserManagementStore();
-      const global = GlobalStore();
+      const userManagement = stores.UserManagementStore();
+      const global = stores.GlobalStore();
       const { hideLoader, startLoader, endLoader } = useLoadingBar();
       const toast = useToastComposable();
       const isAllSelected = ref(false);
diff --git a/src/views/Settings/DateTime/DateTime.vue b/src/views/Settings/DateTime/DateTime.vue
index 70f08223cf..aee4a8620b 100644
--- a/src/views/Settings/DateTime/DateTime.vue
+++ b/src/views/Settings/DateTime/DateTime.vue
@@ -255,7 +255,7 @@ import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin
 import useVuelidateComposable from '@/components/Composables/useVuelidateComposable';
 import { useVuelidate } from '@vuelidate/core';
 import InfoTooltip from '@/components/Global/InfoTooltip.vue';
-import { DateTimeStore, GlobalStore } from '@/store';
+import stores from '@/store';
 import eventBus from '@/eventBus';
 import { required, helpers, requiredIf, sameAs, not } from '@vuelidate/validators';
 
@@ -265,8 +265,8 @@ const formatTime = proxy.$filters.formatTime;
 const notSameAs = (value1, value2) => {
   return value2 ? value1 !== value2 : true;
 }
-const dateTimeStore = DateTimeStore();
-const globalStore = GlobalStore();
+const dateTimeStore = stores.DateTimeStore();
+const globalStore = stores.GlobalStore();
 const toast = useToastComposable();
 const { startLoader, hideLoader, endLoader } = useLoadingBar();
 const { getValidationState } = useVuelidateComposable();
diff --git a/src/views/Settings/HardwareDeconfiguration/MemoryDimms.vue b/src/views/Settings/HardwareDeconfiguration/MemoryDimms.vue
index 4f49688470..b2f5a2e3c7 100644
--- a/src/views/Settings/HardwareDeconfiguration/MemoryDimms.vue
+++ b/src/views/Settings/HardwareDeconfiguration/MemoryDimms.vue
@@ -94,15 +94,15 @@ import useToastComposable from '@/components/Composables/useToastComposable';
 import usePaginationComposable from '@/components/Composables/usePaginationComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useTableFilterComposable from '@/components/Composables/useTableFilterComposable';
-import { HardwareDeconfigurationStore, GlobalStore } from '@/store';
+import stores from '@/store';
 
 const Toast = useToastComposable();
 const { currentPage, perPage, itemsPerPageOptions, getTotalRowCount } =
   usePaginationComposable();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 const { getFilteredTableData } = useTableFilterComposable();
-const hardwareDeconfigurationStore = HardwareDeconfigurationStore();
-const global = GlobalStore();
+const hardwareDeconfigurationStore = stores.HardwareDeconfigurationStore();
+const global = stores.GlobalStore();
 
 onBeforeRouteLeave(() => {
   hideLoader();
diff --git a/src/views/Settings/HardwareDeconfiguration/ProcessorCores.vue b/src/views/Settings/HardwareDeconfiguration/ProcessorCores.vue
index 50b5323480..dbcc0a1c30 100644
--- a/src/views/Settings/HardwareDeconfiguration/ProcessorCores.vue
+++ b/src/views/Settings/HardwareDeconfiguration/ProcessorCores.vue
@@ -110,7 +110,7 @@ import usePaginationComposable from '@/components/Composables/usePaginationCompo
 import useTableSelectableComposable from '@/components/Composables/useTableSelectableComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useTableFilterComposable from '@/components/Composables/useTableFilterComposable';
-import { HardwareDeconfigurationStore, GlobalStore } from '@/store';
+import stores from '@/store';
 
 const Toast = useToastComposable();
 const { currentPage, perPage, itemsPerPageOptions, getTotalRowCount } =
@@ -122,8 +122,8 @@ const {
   } = useTableSelectableComposable();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 const { getFilteredTableData } = useTableFilterComposable();
-const hardwareDeconfigurationStore = HardwareDeconfigurationStore();
-const global = GlobalStore();
+const hardwareDeconfigurationStore = stores.HardwareDeconfigurationStore();
+const global = stores.GlobalStore();
 
 onBeforeRouteLeave(() => {
   hideLoader();
diff --git a/src/views/Settings/Network/Network.vue b/src/views/Settings/Network/Network.vue
index 366a9a4fb2..fd8c18d306 100644
--- a/src/views/Settings/Network/Network.vue
+++ b/src/views/Settings/Network/Network.vue
@@ -85,13 +85,13 @@ import TableIpv4 from './TableIpv4.vue';
 import TableDns from './TableDns.vue';
 import TableIpv6 from './TableIpv6.vue';
 import TableIpv6StaticDefaultGateway from './TableIpv6StaticDefaultGateway.vue';
-import { NetworkStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader, hideLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 
-const networkStore = NetworkStore();
-const authenticationStore = AuthenticationStore();
+const networkStore = stores.NetworkStore();
+const authenticationStore = stores.AuthenticationStore();
 
 const currentHostname = ref('');
 const defaultGateway = ref('');
diff --git a/src/views/Settings/Network/NetworkGlobalSettings.vue b/src/views/Settings/Network/NetworkGlobalSettings.vue
index bc3096db3a..a0748d350a 100644
--- a/src/views/Settings/Network/NetworkGlobalSettings.vue
+++ b/src/views/Settings/Network/NetworkGlobalSettings.vue
@@ -22,11 +22,11 @@ import eventBus from '@/eventBus';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
 import IconEdit from '@carbon/icons-vue/es/edit/16';
 import PageSection from '@/components/Global/PageSection.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { dataFormatter } = useDataFormatterGlobal();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const hostname = ref('');
 
diff --git a/src/views/Settings/Network/NetworkInterfaceSettings.vue b/src/views/Settings/Network/NetworkInterfaceSettings.vue
index 0911efe026..9cd7d4dc70 100644
--- a/src/views/Settings/Network/NetworkInterfaceSettings.vue
+++ b/src/views/Settings/Network/NetworkInterfaceSettings.vue
@@ -85,13 +85,13 @@ import useToast from '@/components/Composables/useToastComposable';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useDataFormatterGlobal from '@/components/Composables/useDataFormatterGlobal';
 import PageSection from '@/components/Global/PageSection.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { startLoader, endLoader } = useLoadingBar();
 const { successToast, errorToast } = useToast();
 const { dataFormatter } = useDataFormatterGlobal();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const props = defineProps({
   tabIndex: {
diff --git a/src/views/Settings/Network/TableDns.vue b/src/views/Settings/Network/TableDns.vue
index 48bf504413..ec6049adf2 100644
--- a/src/views/Settings/Network/TableDns.vue
+++ b/src/views/Settings/Network/TableDns.vue
@@ -52,11 +52,11 @@ import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import PageSection from '@/components/Global/PageSection.vue';
 import TableRowAction from '@/components/Global/TableRowAction.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const props = defineProps({
   tabIndex: {
diff --git a/src/views/Settings/Network/TableIpv4.vue b/src/views/Settings/Network/TableIpv4.vue
index 7308dec9fe..a4f7ecad82 100644
--- a/src/views/Settings/Network/TableIpv4.vue
+++ b/src/views/Settings/Network/TableIpv4.vue
@@ -95,12 +95,12 @@ import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import PageSection from '@/components/Global/PageSection.vue';
 import TableRowAction from '@/components/Global/TableRowAction.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const props = defineProps({
   tabIndex: {
diff --git a/src/views/Settings/Network/TableIpv6.vue b/src/views/Settings/Network/TableIpv6.vue
index 54482749f3..f7257ec450 100644
--- a/src/views/Settings/Network/TableIpv6.vue
+++ b/src/views/Settings/Network/TableIpv6.vue
@@ -117,12 +117,12 @@ import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import PageSection from '@/components/Global/PageSection.vue';
 import TableRowAction from '@/components/Global/TableRowAction.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const props = defineProps({
   tabIndex: {
diff --git a/src/views/Settings/Network/TableIpv6StaticDefaultGateway.vue b/src/views/Settings/Network/TableIpv6StaticDefaultGateway.vue
index 4d865bfa86..143748a111 100644
--- a/src/views/Settings/Network/TableIpv6StaticDefaultGateway.vue
+++ b/src/views/Settings/Network/TableIpv6StaticDefaultGateway.vue
@@ -73,12 +73,12 @@ import IconEdit from '@carbon/icons-vue/es/edit/20';
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import PageSection from '@/components/Global/PageSection.vue';
 import TableRowAction from '@/components/Global/TableRowAction.vue';
-import { NetworkStore } from '@/store';
+import stores from '@/store';
 
 const { successToast, errorToast } = useToast();
 const { startLoader, endLoader } = useLoadingBar();
 
-const networkStore = NetworkStore();
+const networkStore = stores.NetworkStore();
 
 const props = defineProps({
   tabIndex: {
diff --git a/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
index 4b6b1ba673..076ee5d251 100644
--- a/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
+++ b/src/views/Settings/PowerRestorePolicy/PowerRestorePolicy.vue
@@ -54,13 +54,13 @@ import { ref, onMounted, computed } from 'vue';
 import PageTitle from '@/components/Global/PageTitle.vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import Alert from '@/components/Global/Alert.vue';
-import { PowerPolicyStore, BootSettingsStore } from '@/store';
+import stores from '@/store';
 import i18n from '@/i18n';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToastComposable from '@/components/Composables/useToastComposable';
 
-const powerPolicy = PowerPolicyStore();
-const bootSettings = BootSettingsStore();
+const powerPolicy = stores.PowerPolicyStore();
+const bootSettings = stores.BootSettingsStore();
 const Toast = useToastComposable();
 const { hideLoader, startLoader, endLoader } = useLoadingBar();
 const policyValue = ref(null);
diff --git a/src/views/Settings/SnmpAlerts/SnmpAlerts.vue b/src/views/Settings/SnmpAlerts/SnmpAlerts.vue
index 61f265d5c6..201d8f9787 100644
--- a/src/views/Settings/SnmpAlerts/SnmpAlerts.vue
+++ b/src/views/Settings/SnmpAlerts/SnmpAlerts.vue
@@ -103,7 +103,7 @@ import TableRowAction from '@/components/Global/TableRowAction.vue';
 import useLoadingBar from '@/components/Composables/useLoadingBarComposable';
 import useToastComposable from '@/components/Composables/useToastComposable';
 import useTableSelectableComposable from '@/components/Composables/useTableSelectableComposable';
-import { SnmpAlertsStore } from '../../../store';
+import stores from '../../../store';
 import eventBus from '@/eventBus';
   
   const snmpToDelete = ref('');
@@ -125,7 +125,7 @@ import eventBus from '@/eventBus';
         tableHeaderCheckboxModel,
         tableHeaderCheckboxIndeterminate,
   } = useTableSelectableComposable();
-  const snmpAlertsStore = SnmpAlertsStore();
+  const snmpAlertsStore = stores.SnmpAlertsStore();
 
   onBeforeRouteLeave (() => {
     hideLoader();
diff --git a/tests/unit/AppHeader.spec.js b/tests/unit/AppHeader.spec.js
index 98496ac177..1e2070266c 100644
--- a/tests/unit/AppHeader.spec.js
+++ b/tests/unit/AppHeader.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { describe, it, beforeEach, expect, vi } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
-import { GlobalStore, EventLogStore, AuthenticationStore } from '@/store';
+import stores from '@/store';
 import AppHeader from '@/components/AppHeader/AppHeader.vue';
 import eventBus from '@/eventBus';
 
@@ -21,9 +21,9 @@ describe('AppHeader.vue', () => {
     const pinia = createPinia();
     setActivePinia(pinia);
 
-    globalStore = GlobalStore();
-    eventLogStore = EventLogStore();
-    authStore = AuthenticationStore();
+    globalStore = stores.GlobalStore();
+    eventLogStore = stores.EventLogStore();
+    authStore = stores.AuthenticationStore();
 
     globalStore.getSystemInfo = vi.fn();
     eventLogStore.getEventLogData = vi.fn();
diff --git a/vite.config.js b/vite.config.js
index 14384b298d..173913be64 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -77,10 +77,10 @@ export default defineConfig({
         find: '@',
         replacement: fileURLToPath(new URL('./src', import.meta.url)),
       },
-      // { find: /^\.\/store$/, replacement: path.resolve(__dirname, `src/env/store/${VITE_APP_ENV_NAME}.js`) },
-      // { find: /^\.\.\/store$/, replacement: path.resolve(__dirname, `src/env/store/${VITE_APP_ENV_NAME}.js`) },
-      // { find: /^\.\/routes$/, replacement: path.resolve(__dirname, `src/env/router/${VITE_APP_ENV_NAME}.js`) },
-      // { find: /^\.\/AppNavigationData$/, replacement: path.resolve(__dirname, `src/env/components/AppNavigation/${VITE_APP_ENV_NAME}.js`) },
+      { find: /^\.\/store$/, replacement: path.resolve(__dirname, `src/env/store/${VITE_APP_ENV_NAME}.js`) },
+      { find: /^\.\.\/store$/, replacement: path.resolve(__dirname, `src/env/store/${VITE_APP_ENV_NAME}.js`) },
+      { find: /^\.\/routes$/, replacement: path.resolve(__dirname, `src/env/router/${VITE_APP_ENV_NAME}.js`) },
+      { find: /^\.\/AppNavigationData$/, replacement: path.resolve(__dirname, `src/env/components/AppNavigation/${VITE_APP_ENV_NAME}.js`) },
     ],
   },
   optimizeDeps: {