diff --git a/src/components/coreDam/customMetadata/AssetCustomMetadataForm.vue b/src/components/coreDam/customMetadata/AssetCustomMetadataForm.vue
index 46823ef1..4dc7418a 100644
--- a/src/components/coreDam/customMetadata/AssetCustomMetadataForm.vue
+++ b/src/components/coreDam/customMetadata/AssetCustomMetadataForm.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import type { DamAssetType } from '@anzusystems/common-admin'
+import { type DamAssetType, isUndefined } from '@anzusystems/common-admin'
 import { computed } from 'vue'
 import { ACustomDataForm, useDamConfigState } from '@anzusystems/common-admin'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -18,16 +19,25 @@ const emit = defineEmits<{
   (e: 'anyChange'): void
 }>()
 
-const { damConfigAssetCustomFormElements } = useDamConfigState()
+const { getDamConfigAssetCustomFormElements, getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+
+const configAssetCustomFormElements = getDamConfigAssetCustomFormElements(currentExtSystemId.value)
+if (isUndefined(configAssetCustomFormElements)) {
+  throw new Error('Custom form elements must be initialised.')
+}
 
 const elements = computed(() => {
-  return damConfigAssetCustomFormElements.value[props.assetType]
+  return configAssetCustomFormElements[props.assetType]
 })
 
-const { damConfigExtSystem } = useDamConfigState()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const pinnedCount = computed(() => {
-  return damConfigExtSystem.value[props.assetType].customMetadataPinnedAmount
+  return configExtSystem[props.assetType].customMetadataPinnedAmount
 })
 </script>
 
diff --git a/src/views/coreDam/asset/detail/components/AssetDetailDialogSidebar.vue b/src/views/coreDam/asset/detail/components/AssetDetailDialogSidebar.vue
index bc1a99c3..70a4aaa2 100644
--- a/src/views/coreDam/asset/detail/components/AssetDetailDialogSidebar.vue
+++ b/src/views/coreDam/asset/detail/components/AssetDetailDialogSidebar.vue
@@ -2,7 +2,7 @@
 import AssetDetailSidebarMetadata from '@/views/coreDam/asset/detail/components/AssetDetailSidebarMetadata.vue'
 import AssetDetailSidebarROI from '@/views/coreDam/asset/detail/components/AssetDetailSidebarROI.vue'
 import { AssetDetailTab, useAssetDetailTab } from '@/composables/system/assetDetailTab'
-import type { DamAssetStatus, DamAssetType } from '@anzusystems/common-admin'
+import { type DamAssetStatus, type DamAssetType, isUndefined } from '@anzusystems/common-admin'
 import {
   type AssetFileFailReason,
   type AssetFileProcessStatus,
@@ -20,6 +20,7 @@ import DistributionCategoryWidget from '@/views/coreDam/distributionCategory/com
 import AssetDetailSidebarImagePreview from '@/views/coreDam/asset/detail/components/AssetDetailSidebarImagePreview.vue'
 import AssetDetailSidebarVideoShow from '@/views/coreDam/asset/detail/components/videoShow/AssetDetailSidebarVideoShow.vue'
 import { ACL } from '@/types/Permission'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -52,10 +53,15 @@ const { t } = useI18n()
 
 const { activeTab } = useAssetDetailTab()
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const typeHasDistributions = computed(() => {
-  return damConfigExtSystem.value[props.assetType].distribution.distributionServices.length > 0
+  return configExtSystem[props.assetType].distribution.distributionServices.length > 0
 })
 </script>
 
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionBlockedBy.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionBlockedBy.vue
index 40cb400a..c5864f9c 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionBlockedBy.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionBlockedBy.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { DamAssetType, DamDistributionRequirementsConfig } from '@anzusystems/common-admin'
+import { type DamAssetType, type DamDistributionRequirementsConfig, isUndefined } from '@anzusystems/common-admin'
 import {
   cloneDeep,
   DamDistributionRequirementStrategy,
@@ -16,6 +16,7 @@ import { useDistributionFilter } from '@/model/coreDam/filter/DistributionFilter
 import { useDistributionStatus } from '@/model/coreDam/valueObject/DamDistributionStatus'
 import useVuelidate, { type ErrorObject } from '@vuelidate/core'
 import { useI18n } from 'vue-i18n'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 // now only supports strategy AtLeastOne, as BE too
 
@@ -60,13 +61,18 @@ const assetFileIdComputed = computed(() => {
   return props.assetFileId
 })
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const itemsComputed = computed(() => {
   return distributions.value.map((item) => {
     return {
       title:
-        (damConfigExtSystem.value[props.assetType]?.distribution.distributionRequirements[item.distributionService]
+        (configExtSystem[props.assetType]?.distribution.distributionRequirements[item.distributionService]
           ?.title || item.distributionService) + ` (${getDistributionStatusOption(item.status)?.title})`,
       value: item.id,
     }
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemCustom.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemCustom.vue
index 88767663..c0c18083 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemCustom.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemCustom.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import type { DamDistributionServiceType } from '@anzusystems/common-admin'
+import { type DamDistributionServiceType, isUndefined } from '@anzusystems/common-admin'
 import { ACopyText, type DamAssetType, DamDistributionStatus, useDamConfigState } from '@anzusystems/common-admin'
 import DistributionStatusChip from '@/views/coreDam/asset/detail/components/distribution/DistributionStatusChip.vue'
 import type { DistributionCustomItem, DistributionJwItem, DistributionYoutubeItem } from '@/types/coreDam/Distribution'
@@ -8,6 +8,7 @@ import { isDistributionCustomItem } from '@/types/coreDam/Distribution'
 import { useI18n } from 'vue-i18n'
 import DistributionFailReasonChip from '@/views/coreDam/asset/detail/components/distribution/DistributionFailReasonChip.vue'
 import DistributionListItemCustomDistributionDataItem from '@/views/coreDam/asset/detail/components/distribution/DistributionListItemCustomDistributionDataItem.vue'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -25,10 +26,15 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const serviceRequirements = computed(() => {
-  return damConfigExtSystem.value[props.assetType].distribution.distributionRequirements[props.item.distributionService]
+  return configExtSystem[props.assetType].distribution.distributionRequirements[props.item.distributionService]
 })
 </script>
 
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue
index 04c00ab1..262e0781 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import type { DamDistributionServiceType } from '@anzusystems/common-admin'
+import { type DamDistributionServiceType, isUndefined } from '@anzusystems/common-admin'
 import { type DamAssetType, DamDistributionStatus, useDamConfigState } from '@anzusystems/common-admin'
 import DistributionStatusChip from '@/views/coreDam/asset/detail/components/distribution/DistributionStatusChip.vue'
 import type { DistributionCustomItem, DistributionJwItem, DistributionYoutubeItem } from '@/types/coreDam/Distribution'
 import { useI18n } from 'vue-i18n'
 import DistributionFailReasonChip from '@/views/coreDam/asset/detail/components/distribution/DistributionFailReasonChip.vue'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -22,10 +23,15 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const serviceRequirements = computed(() => {
-  return damConfigExtSystem.value[props.assetType].distribution.distributionRequirements[props.item.distributionService]
+  return configExtSystem[props.assetType].distribution.distributionRequirements[props.item.distributionService]
 })
 </script>
 
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemYoutube.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemYoutube.vue
index ca1216e3..696fec72 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemYoutube.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemYoutube.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import type { DamDistributionServiceType } from '@anzusystems/common-admin'
+import { type DamDistributionServiceType, isUndefined } from '@anzusystems/common-admin'
 import { type DamAssetType, DamDistributionStatus, useDamConfigState } from '@anzusystems/common-admin'
 import DistributionStatusChip from '@/views/coreDam/asset/detail/components/distribution/DistributionStatusChip.vue'
 import type { DistributionCustomItem, DistributionJwItem, DistributionYoutubeItem } from '@/types/coreDam/Distribution'
 import { useI18n } from 'vue-i18n'
 import DistributionFailReasonChip from '@/views/coreDam/asset/detail/components/distribution/DistributionFailReasonChip.vue'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -22,10 +23,15 @@ const emit = defineEmits<{
 
 const { t } = useI18n()
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const serviceRequirements = computed(() => {
-  return damConfigExtSystem.value[props.assetType].distribution.distributionRequirements[props.item.distributionService]
+  return configExtSystem[props.assetType].distribution.distributionRequirements[props.item.distributionService]
 })
 </script>
 
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialog.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialog.vue
index 39e199f0..3c1df794 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialog.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
-import type { DamAssetType } from '@anzusystems/common-admin'
+import { type DamAssetType, isUndefined } from '@anzusystems/common-admin'
 import {
   ADialogToolbar,
   DamDistributionServiceType,
@@ -14,6 +14,7 @@ import DistributionNewDialogCustom from '@/views/coreDam/asset/detail/components
 import DistributionNewDialogEmpty from '@/views/coreDam/asset/detail/components/distribution/DistributionNewDialogEmpty.vue'
 import { useI18n } from 'vue-i18n'
 import { useAssetDetailDistributionDialog } from '@/views/coreDam/asset/detail/composables/assetDetailDistributionDialog'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -45,10 +46,15 @@ const closeDialog = () => {
   emit('reloadList')
 }
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const serviceRequirements = computed(() => {
-  return damConfigExtSystem.value[props.assetType].distribution.distributionRequirements
+  return configExtSystem[props.assetType].distribution.distributionRequirements
 })
 
 const activeConfig = computed(() => {
diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialogCustom.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialogCustom.vue
index 426e67a3..83fb8b73 100644
--- a/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialogCustom.vue
+++ b/src/views/coreDam/asset/detail/components/distribution/DistributionNewDialogCustom.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue'
-import type { DamAssetType, DamDistributionRequirementsConfig } from '@anzusystems/common-admin'
+import { type DamAssetType, type DamDistributionRequirementsConfig, isUndefined } from '@anzusystems/common-admin'
 import {
   AFormDatetimePicker,
   AssetFileProcessStatus,
@@ -64,7 +64,10 @@ const { loadDamConfigDistributionCustomFormElements, damConfigDistributionCustom
 const loadFormData = async () => {
   canDisplayForm.value = false
   await loadDamConfigDistributionCustomFormElements(props.distributionServiceName)
-  if (!damConfigDistributionCustomFormElements.value[props.distributionServiceName]) return
+  const configDistributionCustomFormElements = damConfigDistributionCustomFormElements.value.get(
+    props.distributionServiceName
+  )
+  if (isUndefined(configDistributionCustomFormElements)) return
   if (!assetFileId.value || assetFileStatus.value !== AssetFileProcessStatus.Processed) return
   filter.distributionService.model = props.distributionServiceName
   filter.id.model = redistributeId.value
diff --git a/src/views/coreDam/author/composables/authorConfig.ts b/src/views/coreDam/author/composables/authorConfig.ts
index e367fead..a10066c6 100644
--- a/src/views/coreDam/author/composables/authorConfig.ts
+++ b/src/views/coreDam/author/composables/authorConfig.ts
@@ -1,16 +1,23 @@
-import type { DamAssetType } from '@anzusystems/common-admin'
+import { type DamAssetType, isUndefined } from '@anzusystems/common-admin'
 import { useDamConfigState } from '@anzusystems/common-admin'
 import { computed } from 'vue'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 export const useAuthorAssetTypeConfig = (assetType: DamAssetType) => {
-  const { damConfigExtSystem } = useDamConfigState()
+  const { getDamConfigExtSystem } = useDamConfigState()
+  const { currentExtSystemId } = useCurrentExtSystem()
+
+  const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+  if (isUndefined(configExtSystem)) {
+    throw new Error('Ext system must be initialised.')
+  }
 
   const authorEnabled = computed(() => {
-    return damConfigExtSystem.value[assetType].authors.enabled
+    return configExtSystem[assetType].authors.enabled
   })
 
   const authorRequired = computed(() => {
-    return damConfigExtSystem.value[assetType].authors.required
+    return configExtSystem[assetType].authors.required
   })
 
   return {
diff --git a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectOptionSelect.vue b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectOptionSelect.vue
index 9529a585..40db3a21 100644
--- a/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectOptionSelect.vue
+++ b/src/views/coreDam/distributionCategorySelect/components/DistributionCategorySelectOptionSelect.vue
@@ -4,7 +4,8 @@ import type { DistributionCategoryOption } from '@/types/coreDam/DistributionCat
 import { computed } from 'vue'
 import type { ErrorObject } from '@vuelidate/core'
 import { useVuelidate } from '@vuelidate/core'
-import { cloneDeep, useDamConfigState, useValidate } from '@anzusystems/common-admin'
+import { cloneDeep, isUndefined, useDamConfigState, useValidate } from '@anzusystems/common-admin'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
   defineProps<{
@@ -28,11 +29,16 @@ const modelValueComputed = computed({
   },
 })
 
-const { damConfigExtSystem } = useDamConfigState()
+const { getDamConfigExtSystem } = useDamConfigState()
+const { currentExtSystemId } = useCurrentExtSystem()
+const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+if (isUndefined(configExtSystem)) {
+  throw new Error('Ext system must be initialised.')
+}
 
 const isRequired = computed(() => {
   return (
-    damConfigExtSystem.value[props.select.type].distribution.distributionRequirements[props.select.serviceSlug]
+    configExtSystem[props.select.type].distribution.distributionRequirements[props.select.serviceSlug]
       ?.categorySelect?.required ?? false
   )
 })
diff --git a/src/views/coreDam/externalProviderAsset/composables/externalProviderAssetListActions.ts b/src/views/coreDam/externalProviderAsset/composables/externalProviderAssetListActions.ts
index e5fd41df..11b1a1cd 100644
--- a/src/views/coreDam/externalProviderAsset/composables/externalProviderAssetListActions.ts
+++ b/src/views/coreDam/externalProviderAsset/composables/externalProviderAssetListActions.ts
@@ -1,6 +1,6 @@
 import {
   isNull,
-  isString,
+  isString, isUndefined,
   useAlerts,
   useDamConfigState,
   useFilterHelpers,
@@ -23,6 +23,7 @@ import { useExternalProviderAssetDetailStore } from '@/stores/coreDam/externalPr
 import { ROUTE } from '@/router/routes'
 import { useRoute, useRouter } from 'vue-router'
 import { keyboardEventTargetIsAnyFormElement } from '@/utils/event'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 const { showWarning, showErrorsDefault } = useAlerts()
 
@@ -33,7 +34,12 @@ const { activeExternalProvider } = useExternalProviders()
 const filterIsTouched = ref(false)
 
 export function useExternalProviderAssetListActions(sidebarRight: Ref<boolean> | null = null) {
-  const { damConfigExtSystem } = useDamConfigState()
+  const { getDamConfigExtSystem } = useDamConfigState()
+  const { currentExtSystemId } = useCurrentExtSystem()
+  const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+  if (isUndefined(configExtSystem)) {
+    throw new Error('Ext system must be initialised.')
+  }
   const assetDetailStore = useExternalProviderAssetDetailStore()
   const externalProviderAssetListStore = useExternalProviderAssetListStore()
   const uploadQueuesStore = useUploadQueuesStore()
@@ -44,7 +50,7 @@ export function useExternalProviderAssetListActions(sidebarRight: Ref<boolean> |
   const fetchAssetList = async () => {
     if (!activeExternalProvider.value) return
     pagination.page = 1
-    pagination.rowsPerPage = damConfigExtSystem.value.assetExternalProviders[activeExternalProvider.value].listingLimit
+    pagination.rowsPerPage = configExtSystem.assetExternalProviders[activeExternalProvider.value].listingLimit
     try {
       externalProviderAssetListStore.showLoader('hard')
       externalProviderAssetListStore.setList(
@@ -71,7 +77,7 @@ export function useExternalProviderAssetListActions(sidebarRight: Ref<boolean> |
     }
     if (!activeExternalProvider.value) return
     pagination.page = pagination.page + 1
-    pagination.rowsPerPage = damConfigExtSystem.value.assetExternalProviders[activeExternalProvider.value].listingLimit
+    pagination.rowsPerPage = configExtSystem.assetExternalProviders[activeExternalProvider.value].listingLimit
     try {
       externalProviderAssetListStore.showLoader('soft')
       externalProviderAssetListStore.appendList(
@@ -202,7 +208,7 @@ export function useExternalProviderAssetListActions(sidebarRight: Ref<boolean> |
   const route = useRoute()
   const router = useRouter()
   const validateRouteProvider = async () => {
-    if (!(isString(route.params.provider) && damConfigExtSystem.value.assetExternalProviders[route.params.provider])) {
+    if (!(isString(route.params.provider) && configExtSystem.assetExternalProviders[route.params.provider])) {
       await router.push({ name: ROUTE.SYSTEM.NOT_FOUND })
       return
     }
diff --git a/src/views/coreDam/keyword/composables/keywordConfig.ts b/src/views/coreDam/keyword/composables/keywordConfig.ts
index 34441acd..07347bd4 100644
--- a/src/views/coreDam/keyword/composables/keywordConfig.ts
+++ b/src/views/coreDam/keyword/composables/keywordConfig.ts
@@ -1,16 +1,23 @@
-import type { DamAssetType } from '@anzusystems/common-admin'
+import { type DamAssetType, isUndefined } from '@anzusystems/common-admin'
 import { useDamConfigState } from '@anzusystems/common-admin'
 import { computed } from 'vue'
+import { useCurrentExtSystem } from '@/composables/system/currentExtSystem'
 
 export const useKeywordAssetTypeConfig = (assetType: DamAssetType) => {
-  const { damConfigExtSystem } = useDamConfigState()
+  const { getDamConfigExtSystem } = useDamConfigState()
+  const { currentExtSystemId } = useCurrentExtSystem()
+
+  const configExtSystem = getDamConfigExtSystem(currentExtSystemId.value)
+  if (isUndefined(configExtSystem)) {
+    throw new Error('Ext system must be initialised.')
+  }
 
   const keywordEnabled = computed(() => {
-    return damConfigExtSystem.value[assetType].keywords.enabled
+    return configExtSystem[assetType].keywords.enabled
   })
 
   const keywordRequired = computed(() => {
-    return damConfigExtSystem.value[assetType].keywords.required
+    return configExtSystem[assetType].keywords.required
   })
 
   return {