diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
index 9e1f42870f..77dc5668f6 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
@@ -104,11 +104,11 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
-import type { ModelConfiguration } from '@/types/Types';
+import type { ModelConfigurationLegacy } from '@/types/Types';
 
 defineProps<{
 	editValue: string;
-	modelConfigurations: ModelConfiguration[];
+	modelConfigurations: ModelConfigurationLegacy[];
 	calibrationConfig?: boolean;
 	cellEditStates: any[];
 }>();
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
index 1017c786ec..b912898658 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
@@ -47,11 +47,11 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
-import type { ModelConfiguration } from '@/types/Types';
+import type { ModelConfigurationLegacy } from '@/types/Types';
 
 defineProps<{
 	editValue: string;
-	modelConfigurations: ModelConfiguration[];
+	modelConfigurations: ModelConfigurationLegacy[];
 	calibrationConfig?: boolean;
 	cellEditStates: any[];
 	baseInitialsAndParameters: any;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue b/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
index 4d5ba7410a..850bfe15ba 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
@@ -80,7 +80,8 @@
 					:open-value-config="openValueConfig"
 					@close-modal="openValueConfig = false"
 					@update-configuration="
-						(configToUpdate: ModelConfiguration) => emit('update-configuration', configToUpdate)
+						(configToUpdate: ModelConfigurationLegacy) =>
+							emit('update-configuration', configToUpdate)
 					"
 				/>
 			</Teleport>
@@ -106,7 +107,7 @@ import Button from 'primevue/button';
 import SelectButton from 'primevue/selectbutton';
 import { PetrinetRenderer, NodeType } from '@/model-representation/petrinet/petrinet-renderer';
 import { getModelType, getMMT } from '@/services/model';
-import type { Model, ModelConfiguration } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy } from '@/types/Types';
 import TeraResizablePanel from '@/components/widgets/tera-resizable-panel.vue';
 import TeraTooltip from '@/components/widgets/tera-tooltip.vue';
 
@@ -129,7 +130,7 @@ import TeraStratifiedMatrixPreview from '../model-configurations/tera-stratified
 const props = defineProps<{
 	model: Model;
 	isEditable: boolean;
-	modelConfiguration?: ModelConfiguration;
+	modelConfiguration?: ModelConfigurationLegacy;
 	isPreview?: boolean;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
index 45312078a3..7fdf353817 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script setup lang="ts">
-import { Model, ModelConfiguration } from '@/types/Types';
-import { getInitialExpression, getInitialSource } from '@/services/model-configurations';
+import { Model, ModelConfigurationLegacy } from '@/types/Types';
+import { getInitialExpression, getInitialSource } from '@/services/model-configurations-legacy';
 import TeraInput from '@/components/widgets/tera-input.vue';
 import { ref } from 'vue';
 import Button from 'primevue/button';
@@ -43,7 +43,7 @@ import {
 
 const props = defineProps<{
 	model: Model;
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	initialId: string;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
index 632df5cd74..2e8d860e54 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
@@ -55,8 +55,8 @@
 </template>
 
 <script setup lang="ts">
-import { Model, ModelConfiguration } from '@/types/Types';
-import { getInitials } from '@/services/model-configurations';
+import { Model, ModelConfigurationLegacy } from '@/types/Types';
+import { getInitials } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
 import { ref } from 'vue';
 import { collapseInitials, isStratifiedModel } from '@/model-representation/mira/mira';
@@ -69,8 +69,8 @@ import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-ma
 import TeraInitialEntry from './tera-initial-entry.vue';
 
 const props = defineProps<{
+	modelConfiguration: ModelConfigurationLegacy;
 	model: Model;
-	modelConfiguration: ModelConfiguration;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 }>();
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
index 5b2db67da5..db8c79b329 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
@@ -98,7 +98,7 @@ import AccordionTab from 'primevue/accordiontab';
 import Column from 'primevue/column';
 import DataTable from 'primevue/datatable';
 import { FeatureConfig, ResultType } from '@/types/common';
-import type { Dataset, Model, ModelConfiguration, ProjectAsset } from '@/types/Types';
+import type { Dataset, Model, ModelConfigurationLegacy, ProjectAsset } from '@/types/Types';
 import { AssetType } from '@/types/Types';
 import SelectButton from 'primevue/selectbutton';
 import TeraRelatedDocuments from '@/components/widgets/tera-related-documents.vue';
@@ -112,7 +112,7 @@ import TeraModelSemanticTables from '@/components/model/tera-model-semantic-tabl
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	featureConfig?: FeatureConfig;
 	isGeneratingCard?: boolean;
 }>();
@@ -210,7 +210,7 @@ function fetchAsset() {
 	emit('fetch-model');
 }
 
-function updateConfiguration(updatedConfiguration: ModelConfiguration) {
+function updateConfiguration(updatedConfiguration: ModelConfigurationLegacy) {
 	emit('update-configuration', updatedConfiguration);
 }
 </script>
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
index 02ba0c687a..3f928f877a 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
@@ -90,8 +90,11 @@
 </template>
 
 <script setup lang="ts">
-import { Model, ModelConfiguration } from '@/types/Types';
-import { getParameterSource, getParameterDistribution } from '@/services/model-configurations';
+import { ModelConfigurationLegacy, Model } from '@/types/Types';
+import {
+	getParameterSource,
+	getParameterDistribution
+} from '@/services/model-configurations-legacy';
 import TeraInput from '@/components/widgets/tera-input.vue';
 import { ref } from 'vue';
 import Button from 'primevue/button';
@@ -101,7 +104,7 @@ import { getParameter } from '@/model-representation/service';
 
 const props = defineProps<{
 	model: Model;
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	parameterId: string;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
index 56d1472fc0..028e70d750 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
@@ -136,8 +136,8 @@
 </template>
 
 <script setup lang="ts">
-import { Model, ModelConfiguration, ModelDistribution } from '@/types/Types';
-import { getParameterDistribution, getParameters } from '@/services/model-configurations';
+import { Model, ModelConfigurationLegacy, ModelDistribution } from '@/types/Types';
+import { getParameterDistribution, getParameters } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
 import { computed, ref } from 'vue';
 import { collapseParameters, isStratifiedModel } from '@/model-representation/mira/mira';
@@ -159,7 +159,7 @@ import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-ma
 
 const props = defineProps<{
 	model: Model;
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 }>();
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
index 277df8e8c9..0e9940e959 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
@@ -235,7 +235,7 @@
 import { computed, ref, watch } from 'vue';
 import { cloneDeep, isEmpty } from 'lodash';
 import Button from 'primevue/button';
-import type { Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import InputText from 'primevue/inputtext';
 import Datatable from 'primevue/datatable';
 import Column from 'primevue/column';
@@ -257,7 +257,7 @@ import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 	data?: ModelConfigTableData[]; // we can use our own passed in data or the computed one.  this is for the embedded matrix table
@@ -272,7 +272,7 @@ const isStratified = computed(() => isStratifiedModel(props.mmt));
 
 interface SuggestedValue {
 	parameter: ModelParameter;
-	configuration: ModelConfiguration;
+	configuration: ModelConfigurationLegacy;
 	index: number;
 }
 const selectedValue = ref<SuggestedValue | null>(null);
diff --git a/packages/client/hmi-client/src/components/model/tera-model.vue b/packages/client/hmi-client/src/components/model/tera-model.vue
index c816b4a60b..5cfc14a3e4 100644
--- a/packages/client/hmi-client/src/components/model/tera-model.vue
+++ b/packages/client/hmi-client/src/components/model/tera-model.vue
@@ -55,10 +55,13 @@ import TeraModelDescription from '@/components/model/petrinet/tera-model-descrip
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
 import ContextMenu from 'primevue/contextmenu';
-import { addDefaultConfiguration, updateModelConfiguration } from '@/services/model-configurations';
+import {
+	addDefaultConfiguration,
+	updateModelConfiguration
+} from '@/services/model-configurations-legacy';
 import { getModel, getModelConfigurations, isModelEmpty, updateModel } from '@/services/model';
 import { FeatureConfig } from '@/types/common';
-import { AssetType, type Model, type ModelConfiguration } from '@/types/Types';
+import { AssetType, type Model, type ModelConfigurationLegacy } from '@/types/Types';
 import { useProjects } from '@/composables/project';
 import { logger } from '@/utils/logger';
 
@@ -84,7 +87,7 @@ const emit = defineEmits([
 ]);
 
 const model = ref<Model | null>(null);
-const modelConfigurations = ref<ModelConfiguration[]>([]);
+const modelConfigurations = ref<ModelConfigurationLegacy[]>([]);
 const newName = ref('New Model');
 const isRenaming = ref(false);
 const isModelLoading = ref(false);
@@ -166,7 +169,7 @@ async function updateModelName() {
 	isRenaming.value = false;
 }
 
-async function updateConfiguration(updatedConfiguration: ModelConfiguration) {
+async function updateConfiguration(updatedConfiguration: ModelConfigurationLegacy) {
 	await updateModelConfiguration(updatedConfiguration);
 	setTimeout(async () => {
 		emit('update-model-configuration');
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
index 80071da91b..821e4c84c4 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
@@ -194,7 +194,7 @@ import {
 	ClientEventType,
 	CsvAsset,
 	DatasetColumn,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	State
 } from '@/types/Types';
 import { getTimespan, chartActionsProxy, drilldownChartSize } from '@/components/workflow/util';
@@ -228,7 +228,7 @@ const modelStateOptions = ref<State[] | undefined>();
 const datasetColumns = ref<DatasetColumn[]>();
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 
-const modelConfig = ref<ModelConfiguration>();
+const modelConfig = ref<ModelConfigurationLegacy>();
 
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0]?.value?.[0]);
 const datasetId = computed<string | undefined>(() => props.node.inputs[1]?.value?.[0]);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
index 82f2805283..92c2b76e7f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
@@ -209,7 +209,7 @@ import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel
 import { chartActionsProxy, drilldownChartSize, getTimespan } from '@/components/workflow/util';
 import type {
 	CsvAsset,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	EnsembleModelConfigs,
 	EnsembleCalibrationCiemssRequest,
 	State
@@ -287,7 +287,7 @@ const currentDatasetFileName = ref<string>();
 const datasetColumnNames = ref<string[]>();
 
 const listModelLabels = ref<string[]>([]);
-const allModelConfigurations = ref<ModelConfiguration[]>([]);
+const allModelConfigurations = ref<ModelConfigurationLegacy[]>([]);
 // List of each observible + state for each model.
 const allModelOptions = ref<State[][]>([]);
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
index 5aa6da2f76..ea9f99d995 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
@@ -201,7 +201,7 @@ import {
 	ClientEventType,
 	CsvAsset,
 	DatasetColumn,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	ScimlStatusUpdate,
 	State
 } from '@/types/Types';
@@ -256,7 +256,7 @@ const inProgressSimulationId = ref<string>(props.node.state.inProgressSimulation
 
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 
-const modelConfig = ref<ModelConfiguration>();
+const modelConfig = ref<ModelConfigurationLegacy>();
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0]?.value?.[0]);
 const datasetId = computed<string | undefined>(() => props.node.inputs[1]?.value?.[0]);
 const currentDatasetFileName = ref<string>();
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
index f1a3e4cf6e..d7945c937e 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
@@ -185,12 +185,12 @@ import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue'
 import type {
 	FunmanPostQueriesRequest,
 	Model,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	ModelParameter
 } from '@/types/Types';
 import { makeQueries } from '@/services/models/funman-service';
 import { WorkflowNode, WorkflowOutput } from '@/types/workflow';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { useToastService } from '@/services/toast';
 import { pythonInstance } from '@/python/PyodideController';
 import TeraFunmanOutput from '@/components/workflow/ops/funman/tera-funman-output.vue';
@@ -294,7 +294,7 @@ const requestConstraints = computed(() =>
 
 const requestParameters = ref<any[]>([]);
 const model = ref<Model | null>();
-const modelConfiguration = ref<ModelConfiguration>();
+const modelConfiguration = ref<ModelConfigurationLegacy>();
 
 const modelStates = ref<string[]>([]); // Used for form's multiselect.
 const modelParameters = ref<string[]>([]);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
index 0fe7597d55..f69381271a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
@@ -1,5 +1,5 @@
 import { Operation, WorkflowOperationTypes, BaseState } from '@/types/workflow';
-import type { Model, ModelConfiguration } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy } from '@/types/Types';
 
 export const name = 'ModelConfigOperation';
 
@@ -9,7 +9,7 @@ export interface ModelEditCode {
 }
 
 export interface ModelConfigOperationState extends BaseState {
-	transientModelConfig: ModelConfiguration;
+	transientModelConfig: ModelConfigurationLegacy;
 	modelEditCodeHistory: ModelEditCode[];
 	hasCodeBeenRun: boolean;
 	tempConfigId: string; // This is used for beaker context when there is no output selected. It is a config id that is in TDS and marked as temp
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
index 929195c042..0f5e926874 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
@@ -310,9 +310,9 @@ import {
 	setInitialExpression,
 	setParameterSource,
 	setParameterDistributions
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import { useToastService } from '@/services/toast';
-import type { Intervention, Model, ModelConfiguration } from '@/types/Types';
+import type { Intervention, Model, ModelConfigurationLegacy } from '@/types/Types';
 import { TaskStatus } from '@/types/Types';
 import type { WorkflowNode } from '@/types/workflow';
 import { OperatorStatus } from '@/types/workflow';
@@ -347,7 +347,7 @@ const emit = defineEmits(['append-output', 'update-state', 'select-output', 'clo
 
 interface BasicKnobs {
 	tempConfigId: string;
-	transientModelConfig: ModelConfiguration;
+	transientModelConfig: ModelConfigurationLegacy;
 }
 
 const knobs = ref<BasicKnobs>({
@@ -564,8 +564,8 @@ const datasetIds = computed(() => props.node.inputs?.[2]?.value);
 
 const suggestedConfigurationContext = ref<{
 	isOpen: boolean;
-	tableData: ModelConfiguration[];
-	modelConfiguration: ModelConfiguration | null;
+	tableData: ModelConfigurationLegacy[];
+	modelConfiguration: ModelConfigurationLegacy | null;
 }>({
 	isOpen: false,
 	tableData: [],
@@ -730,7 +730,7 @@ const initialize = async () => {
 	}
 };
 
-const applyConfigValues = (config: ModelConfiguration) => {
+const applyConfigValues = (config: ModelConfigurationLegacy) => {
 	const state = cloneDeep(props.node.state);
 	knobs.value.transientModelConfig = cloneDeep(config);
 
@@ -762,7 +762,7 @@ const applyConfigValues = (config: ModelConfiguration) => {
 	logger.success(`Configuration applied ${config.name}`);
 };
 
-const onOpenSuggestedConfiguration = (config: ModelConfiguration) => {
+const onOpenSuggestedConfiguration = (config: ModelConfigurationLegacy) => {
 	suggestedConfigurationContext.value.modelConfiguration = config;
 	suggestedConfigurationContext.value.isOpen = true;
 };
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
index 87acffed2c..2fed2d3351 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
@@ -112,7 +112,7 @@ import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-inp
 import teraNotebookJupyterThoughtOutput from '@/components/llm/tera-notebook-jupyter-thought-output.vue';
 
 import { KernelSessionManager } from '@/services/jupyter';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
+import { getModelIdFromModelConfigurationId } from '@/services/model-configurations-legacy';
 import TeraSaveAssetModal from '@/page/project/components/tera-save-asset-modal.vue';
 import { saveCodeToState } from '@/services/notebook';
 import { ModelEditOperationState } from './model-edit-operation';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue b/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
index c4da9ea625..aa34a8d0f8 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
@@ -30,7 +30,7 @@ import { v4 as uuidv4 } from 'uuid';
 import type { NotebookSession } from '@/types/Types';
 import { cloneDeep } from 'lodash';
 import { getModel } from '@/services/model';
-import { addDefaultConfiguration } from '@/services/model-configurations';
+import { addDefaultConfiguration } from '@/services/model-configurations-legacy';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 
 import { ModelTransformerState } from './model-transformer-operation';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
index cacb401939..8fd510e112 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
@@ -313,7 +313,7 @@ import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel
 import {
 	getModelConfigurationById,
 	createModelConfiguration
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import {
 	makeOptimizeJobCiemss,
 	getRunResultCiemss,
@@ -322,7 +322,7 @@ import {
 import { createCsvAssetFromRunResults } from '@/services/dataset';
 // Types:
 import {
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	State,
 	ModelParameter,
 	OptimizeRequestCiemss,
@@ -473,7 +473,7 @@ const optimizationResult = ref<any>('');
 
 const modelParameterOptions = ref<ModelParameter[]>([]);
 const modelStateAndObsOptions = ref<string[]>([]);
-const modelConfiguration = ref<ModelConfiguration>();
+const modelConfiguration = ref<ModelConfigurationLegacy>();
 
 const showAdditionalOptions = ref(true);
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
index af38e73f3c..5f7f7f1b0f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
@@ -223,7 +223,7 @@ import {
 	getRunResultCiemss,
 	makeEnsembleCiemssSimulation
 } from '@/services/models/simulation-service';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { chartActionsProxy, drilldownChartSize } from '@/components/workflow/util';
 
 import type { WorkflowNode } from '@/types/workflow';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
index cb859ee04f..7ed9d6934f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
@@ -113,7 +113,7 @@ import InputNumber from 'primevue/inputnumber';
 import type { CsvAsset, SimulationRequest, TimeSpan } from '@/types/Types';
 import type { RunResults } from '@/types/SimulateConfig';
 import type { WorkflowNode } from '@/types/workflow';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { getRunResult, makeForecastJob } from '@/services/models/simulation-service';
 import { createCsvAssetFromRunResults } from '@/services/dataset';
 import { csvParse } from 'd3';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
index 9829da5868..4d88a7c8d4 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
@@ -131,7 +131,7 @@ import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
 import type { Model } from '@/types/Types';
 import { AssetType } from '@/types/Types';
 import { AMRSchemaNames } from '@/types/common';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
+import { getModelIdFromModelConfigurationId } from '@/services/model-configurations-legacy';
 
 /* Jupyter imports */
 import { KernelSessionManager } from '@/services/jupyter';
diff --git a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
index b97b898848..5ba148910a 100644
--- a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
+++ b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
@@ -1,5 +1,5 @@
-import { updateModelConfiguration } from '@/services/model-configurations';
-import { Model, ModelConfiguration } from '@/types/Types';
+import { updateModelConfiguration } from '@/services/model-configurations-legacy';
+import { Model, ModelConfigurationLegacy } from '@/types/Types';
 
 const replaceExactString = (str: string, wordToReplace: string, replacementWord: string): string =>
 	str.trim() === wordToReplace.trim() ? str.replace(wordToReplace, replacementWord) : str;
@@ -94,7 +94,7 @@ export const updateParameterId = (amr: Model, id: string, newId: string) => {
 };
 
 export const updateConfigFields = async (
-	modelConfigs: ModelConfiguration[],
+	modelConfigs: ModelConfigurationLegacy[],
 	id: string,
 	newId: string
 ) => {
diff --git a/packages/client/hmi-client/src/services/calibrate-workflow.ts b/packages/client/hmi-client/src/services/calibrate-workflow.ts
index 9f903f40a4..57b038ae4c 100644
--- a/packages/client/hmi-client/src/services/calibrate-workflow.ts
+++ b/packages/client/hmi-client/src/services/calibrate-workflow.ts
@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 
-import type { ModelConfiguration, Dataset, CsvAsset, State } from '@/types/Types';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import type { ModelConfigurationLegacy, Dataset, CsvAsset, State } from '@/types/Types';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { downloadRawFile, getDataset } from '@/services/dataset';
 
 export interface CalibrateMap {
@@ -13,7 +13,8 @@ export interface CalibrateMap {
 // Takes a model config Id and grabs relevant objects
 export const setupModelInput = async (modelConfigId: string | undefined) => {
 	if (modelConfigId) {
-		const modelConfiguration: ModelConfiguration = await getModelConfigurationById(modelConfigId);
+		const modelConfiguration: ModelConfigurationLegacy =
+			await getModelConfigurationById(modelConfigId);
 		const modelOptions: State[] = modelConfiguration.configuration.model.states;
 
 		// add observables
diff --git a/packages/client/hmi-client/src/services/model-configurations-legacy.ts b/packages/client/hmi-client/src/services/model-configurations-legacy.ts
new file mode 100644
index 0000000000..46c78e12d4
--- /dev/null
+++ b/packages/client/hmi-client/src/services/model-configurations-legacy.ts
@@ -0,0 +1,326 @@
+import _, { cloneDeep, isEmpty } from 'lodash';
+import API from '@/api/api';
+import type {
+	ModelConfigurationLegacy,
+	Model,
+	Intervention,
+	ModelParameter,
+	ModelDistribution,
+	Initial
+} from '@/types/Types';
+import { pythonInstance } from '@/python/PyodideController';
+import { DistributionType } from '@/services/distribution';
+
+export const getAllModelConfigurations = async () => {
+	const response = await API.get(`/model-configurations-legacy`);
+	return (response?.data as ModelConfigurationLegacy[]) ?? null;
+};
+
+export const getModelConfigurationById = async (id: string) => {
+	const response = await API.get(`/model-configurations-legacy/${id}`);
+	return (response?.data as ModelConfigurationLegacy) ?? null;
+};
+
+export const getModelIdFromModelConfigurationId = async (id: string) => {
+	const modelConfiguration = await getModelConfigurationById(id);
+	return modelConfiguration?.model_id ?? null;
+};
+
+export const createModelConfiguration = async (
+	model_id: string | undefined,
+	name: string,
+	description: string,
+	configuration: Model,
+	isTemporary?: boolean,
+	givenInterventions?: Intervention[]
+) => {
+	if (!model_id) {
+		return null;
+	}
+	const temporary = isTemporary ?? false;
+	const interventions = givenInterventions ?? [];
+	const response = await API.post(`/model-configurations-legacy`, {
+		model_id,
+		temporary,
+		name,
+		description,
+		configuration,
+		interventions
+	});
+	return response?.data ?? null;
+};
+
+export const addDefaultConfiguration = async (model: Model): Promise<void> => {
+	await createModelConfiguration(model.id, 'Default config', 'Default config', model);
+};
+
+export const updateModelConfiguration = async (config: ModelConfigurationLegacy) => {
+	// Do a sanity pass to ensure type-safety
+	const model: Model = config.configuration as Model;
+	const parameters = model.semantics?.ode.parameters;
+	if (parameters) {
+		parameters.forEach((param) => {
+			if (param.value && typeof param.value === 'string' && _.isNumber(+param.value)) {
+				param.value = +param.value;
+				console.debug(`corerce ${param.id} ${param.value} to number`);
+			}
+		});
+	}
+
+	// If the "default" config is updated we want to update the model as well
+	// because the model as a copy of the data
+	if (config.name === 'Default config') {
+		API.put(`/models/${config.configuration.id}`, config.configuration);
+	}
+
+	const response = await API.put(`/model-configurations-legacy/${config.id}`, config);
+	return response?.data ?? null;
+};
+
+export function sanityCheck(config: ModelConfigurationLegacy): string[] {
+	const errors: string[] = [];
+	const modelToCheck = config.configuration;
+	if (!modelToCheck) {
+		errors.push('no model defined in configuration');
+		return errors;
+	}
+
+	const parameters: ModelParameter[] = getParameters(config);
+
+	parameters.forEach((p) => {
+		const val = p.value;
+		const max = parseFloat(p.distribution?.parameters.maximum);
+		const min = parseFloat(p.distribution?.parameters.minimum);
+		if (val && val > max) {
+			errors.push(`${p.id} value ${p.value} > distribution max of ${max}`);
+		}
+		if (val && val < min) {
+			errors.push(`${p.id} value ${p.value} < distribution min of ${min}`);
+		}
+
+		// Arbitrary 0.003 here, try to ensure interval is significant w.r.t value
+		const interval = Math.abs(max - min);
+		if (val !== 0 && val !== undefined && Math.abs(interval / val) < 0.003) {
+			errors.push(`${p.id} distribution range [${min}, ${max}] may be too small`);
+		}
+
+		// no constant & no/partial distribution
+		if (val === undefined || Number.isNaN(val)) {
+			if (Number.isNaN(max) || Number.isNaN(min)) {
+				errors.push(`${p.id} has no constant value and partial/no distribution`);
+			}
+		}
+	});
+	return errors;
+}
+
+export function getInitial(
+	config: ModelConfigurationLegacy,
+	initialId: string
+): Initial | undefined {
+	return config.configuration.semantics?.ode.initials?.find(
+		(initial) => initial.target === initialId
+	);
+}
+
+export function getInitialSource(config: ModelConfigurationLegacy, initialId: string): string {
+	return config.configuration.metadata?.initials?.[initialId]?.source ?? '';
+}
+
+export function getInitialName(config: ModelConfigurationLegacy, initialId: string): string {
+	return config.configuration.metadata?.initials?.[initialId]?.name ?? '';
+}
+
+export function getInitialUnit(config: ModelConfigurationLegacy, initialId: string): string {
+	return config.configuration.metadata?.initials?.[initialId]?.unit ?? '';
+}
+
+export function getInitialDescription(config: ModelConfigurationLegacy, initialId: string): string {
+	return config.configuration.metadata?.initials?.[initialId]?.description ?? '';
+}
+
+export function getInitialExpression(config: ModelConfigurationLegacy, initialId: string): string {
+	const initial = getInitial(config, initialId);
+	return initial?.expression ?? '';
+}
+
+export function setInitialSource(
+	config: ModelConfigurationLegacy,
+	initialId: string,
+	source: string
+): void {
+	const initial = config.configuration.metadata?.initials?.[initialId];
+	if (initial) {
+		initial.source = source;
+	}
+}
+
+export function setInitialExpression(
+	config: ModelConfigurationLegacy,
+	initialId: string,
+	expression: string
+): void {
+	const initial = getInitial(config, initialId);
+	if (!initial) return;
+
+	pythonInstance
+		.parseExpression(expression)
+		.then((result) => {
+			const mathml = result.mathml;
+			initial.expression = expression;
+			initial.expression_mathml = mathml;
+		})
+		.catch((error) => {
+			// Handle error appropriately
+			console.error('Error parsing expression:', error);
+		});
+}
+
+export function setInitialName(
+	config: ModelConfigurationLegacy,
+	initialId: string,
+	name: string
+): void {
+	const initial = config.configuration.metadata?.initials?.[initialId];
+	if (initial) {
+		initial.name = name;
+	}
+}
+
+export function setInitialDescription(
+	config: ModelConfigurationLegacy,
+	initialId: string,
+	description: string
+): void {
+	const initial = config.configuration.metadata?.initials?.[initialId];
+	if (initial) {
+		initial.description = description;
+	}
+}
+
+export function getParameter(
+	config: ModelConfigurationLegacy,
+	parameterId: string
+): ModelParameter | undefined {
+	return config.configuration.semantics?.ode.parameters?.find((param) => param.id === parameterId);
+}
+
+export function getParameterName(config: ModelConfigurationLegacy, parameterId: string): string {
+	const parameter = getParameter(config, parameterId);
+	return parameter?.name ?? '';
+}
+
+export function getParameterDescription(
+	config: ModelConfigurationLegacy,
+	parameterId: string
+): string {
+	const parameter = getParameter(config, parameterId);
+	return parameter?.description ?? '';
+}
+
+export function getParameterUnit(config: ModelConfigurationLegacy, parameterId: string): string {
+	const parameter = getParameter(config, parameterId);
+	return parameter?.units?.expression ?? '';
+}
+
+export function getParameterDistribution(
+	config: ModelConfigurationLegacy,
+	parameterId: string
+): ModelDistribution {
+	const parameter = cloneDeep(getParameter(config, parameterId));
+
+	if (!parameter?.distribution) {
+		return {
+			type: DistributionType.Constant,
+			parameters: {
+				value: parameter?.value
+			}
+		};
+	}
+
+	if (parameter.distribution.type === 'Uniform1')
+		parameter.distribution.type = DistributionType.Uniform;
+
+	return parameter.distribution;
+}
+
+export function getInterventions(config: ModelConfigurationLegacy): Intervention[] {
+	return config.interventions ?? [];
+}
+
+// FIXME: for set and remove interventions, we should not be using the index.  This should be addressed when we move to the new model config data structure.
+export function setIntervention(
+	config: ModelConfigurationLegacy,
+	index: number,
+	intervention: Intervention
+): void {
+	const interventions = getInterventions(config);
+	interventions[index] = intervention;
+}
+
+export function removeIntervention(config: ModelConfigurationLegacy, index: number): void {
+	const interventions = getInterventions(config);
+	interventions.splice(index, 1);
+}
+
+export function getParameterSource(config: ModelConfigurationLegacy, parameterId: string): string {
+	return config.configuration.metadata?.parameters?.[parameterId]?.source ?? '';
+}
+
+export function setParameterSource(
+	config: ModelConfigurationLegacy,
+	parameterId: string,
+	source: string
+): void {
+	const parameter = config.configuration.metadata?.parameters?.[parameterId];
+	if (parameter) {
+		parameter.source = source;
+	}
+}
+
+export function setParameterDistribution(
+	config: ModelConfigurationLegacy,
+	parameterId: string,
+	distribution: ModelDistribution
+): void {
+	const parameter = getParameter(config, parameterId);
+	if (!parameter) return;
+
+	const type = distribution.type;
+	if (type === DistributionType.Constant) {
+		delete parameter.distribution;
+		parameter.value = distribution.parameters?.value ?? 0;
+	} else if (type === DistributionType.Uniform) {
+		parameter.distribution = convertToUniformDistribution(distribution);
+	}
+}
+
+function convertToUniformDistribution(distribution: ModelDistribution): ModelDistribution {
+	// if no parameters, initialize
+	if (isEmpty(distribution.parameters)) distribution.parameters = { minimum: 0, maximum: 0 };
+
+	return {
+		type: DistributionType.Uniform,
+		parameters: {
+			minimum: distribution.parameters.minimum,
+			maximum: distribution.parameters.maximum
+		}
+	};
+}
+
+export function getParameters(config: ModelConfigurationLegacy): ModelParameter[] {
+	return config.configuration.semantics?.ode.parameters ?? [];
+}
+
+export function getInitials(config: ModelConfigurationLegacy): Initial[] {
+	return config.configuration.semantics?.ode.initials ?? [];
+}
+
+export function setParameterDistributions(
+	config: ModelConfigurationLegacy,
+	distributionParameterMappings: { id: string; distribution: ModelDistribution }[]
+): void {
+	distributionParameterMappings.forEach((mapping) => {
+		setParameterDistribution(config, mapping.id, mapping.distribution);
+	});
+}
diff --git a/packages/client/hmi-client/src/services/model-configurations.ts b/packages/client/hmi-client/src/services/model-configurations.ts
index 750f28ea81..d7dea4987a 100644
--- a/packages/client/hmi-client/src/services/model-configurations.ts
+++ b/packages/client/hmi-client/src/services/model-configurations.ts
@@ -1,316 +1,28 @@
-import _, { cloneDeep, isEmpty } from 'lodash';
 import API from '@/api/api';
-import type {
-	ModelConfiguration,
-	Model,
-	Intervention,
-	ModelParameter,
-	ModelDistribution,
-	Initial
-} from '@/types/Types';
-import { pythonInstance } from '@/python/PyodideController';
-import { DistributionType } from '@/services/distribution';
+import type { ModelConfiguration } from '@/types/Types';
 
-export const getAllModelConfigurations = async () => {
+export const getAllModelConfigurations = async (): Promise<ModelConfiguration[]> => {
 	const response = await API.get(`/model-configurations`);
-	return (response?.data as ModelConfiguration[]) ?? null;
+	return response?.data ?? null;
 };
 
-export const getModelConfigurationById = async (id: string) => {
+export const getModelConfigurationById = async (id: string): Promise<ModelConfiguration> => {
 	const response = await API.get(`/model-configurations/${id}`);
-	return (response?.data as ModelConfiguration) ?? null;
-};
-
-export const getModelIdFromModelConfigurationId = async (id: string) => {
-	const modelConfiguration = await getModelConfigurationById(id);
-	return modelConfiguration?.model_id ?? null;
+	return response?.data ?? null;
 };
 
 export const createModelConfiguration = async (
-	model_id: string | undefined,
-	name: string,
-	description: string,
-	configuration: Model,
-	isTemporary?: boolean,
-	givenInterventions?: Intervention[]
-) => {
-	if (!model_id) {
-		return null;
-	}
-	const temporary = isTemporary ?? false;
-	const interventions = givenInterventions ?? [];
-	const response = await API.post(`/model-configurations`, {
-		model_id,
-		temporary,
-		name,
-		description,
-		configuration,
-		interventions
-	});
+	modelConfiguration: ModelConfiguration
+): Promise<ModelConfiguration> => {
+	modelConfiguration.temporary = modelConfiguration.temporary ?? false;
+	const response = await API.post(`/model-configurations`, modelConfiguration);
 	return response?.data ?? null;
 };
 
-export const addDefaultConfiguration = async (model: Model): Promise<void> => {
-	await createModelConfiguration(model.id, 'Default config', 'Default config', model);
-};
-
-export const updateModelConfiguration = async (config: ModelConfiguration) => {
-	// Do a sanity pass to ensure type-safety
-	const model: Model = config.configuration as Model;
-	const parameters = model.semantics?.ode.parameters;
-	if (parameters) {
-		parameters.forEach((param) => {
-			if (param.value && typeof param.value === 'string' && _.isNumber(+param.value)) {
-				param.value = +param.value;
-				console.debug(`corerce ${param.id} ${param.value} to number`);
-			}
-		});
-	}
-
-	// If the "default" config is updated we want to update the model as well
-	// because the model as a copy of the data
-	if (config.name === 'Default config') {
-		API.put(`/models/${config.configuration.id}`, config.configuration);
-	}
-
-	const response = await API.put(`/model-configurations/${config.id}`, config);
+export const updateModelConfiguration = async (modelConfiguration: ModelConfiguration) => {
+	const response = await API.put(
+		`/model-configurations/${modelConfiguration.id}`,
+		modelConfiguration
+	);
 	return response?.data ?? null;
 };
-
-export function sanityCheck(config: ModelConfiguration): string[] {
-	const errors: string[] = [];
-	const modelToCheck = config.configuration;
-	if (!modelToCheck) {
-		errors.push('no model defined in configuration');
-		return errors;
-	}
-
-	const parameters: ModelParameter[] = getParameters(config);
-
-	parameters.forEach((p) => {
-		const val = p.value;
-		const max = parseFloat(p.distribution?.parameters.maximum);
-		const min = parseFloat(p.distribution?.parameters.minimum);
-		if (val && val > max) {
-			errors.push(`${p.id} value ${p.value} > distribution max of ${max}`);
-		}
-		if (val && val < min) {
-			errors.push(`${p.id} value ${p.value} < distribution min of ${min}`);
-		}
-
-		// Arbitrary 0.003 here, try to ensure interval is significant w.r.t value
-		const interval = Math.abs(max - min);
-		if (val !== 0 && val !== undefined && Math.abs(interval / val) < 0.003) {
-			errors.push(`${p.id} distribution range [${min}, ${max}] may be too small`);
-		}
-
-		// no constant & no/partial distribution
-		if (val === undefined || Number.isNaN(val)) {
-			if (Number.isNaN(max) || Number.isNaN(min)) {
-				errors.push(`${p.id} has no constant value and partial/no distribution`);
-			}
-		}
-	});
-	return errors;
-}
-
-export function getInitial(config: ModelConfiguration, initialId: string): Initial | undefined {
-	return config.configuration.semantics?.ode.initials?.find(
-		(initial) => initial.target === initialId
-	);
-}
-
-export function getInitialSource(config: ModelConfiguration, initialId: string): string {
-	return config.configuration.metadata?.initials?.[initialId]?.source ?? '';
-}
-
-export function getInitialName(config: ModelConfiguration, initialId: string): string {
-	return config.configuration.metadata?.initials?.[initialId]?.name ?? '';
-}
-
-export function getInitialUnit(config: ModelConfiguration, initialId: string): string {
-	return config.configuration.metadata?.initials?.[initialId]?.unit ?? '';
-}
-
-export function getInitialDescription(config: ModelConfiguration, initialId: string): string {
-	return config.configuration.metadata?.initials?.[initialId]?.description ?? '';
-}
-
-export function getInitialExpression(config: ModelConfiguration, initialId: string): string {
-	const initial = getInitial(config, initialId);
-	return initial?.expression ?? '';
-}
-
-export function setInitialSource(
-	config: ModelConfiguration,
-	initialId: string,
-	source: string
-): void {
-	const initial = config.configuration.metadata?.initials?.[initialId];
-	if (initial) {
-		initial.source = source;
-	}
-}
-
-export function setInitialExpression(
-	config: ModelConfiguration,
-	initialId: string,
-	expression: string
-): void {
-	const initial = getInitial(config, initialId);
-	if (!initial) return;
-
-	pythonInstance
-		.parseExpression(expression)
-		.then((result) => {
-			const mathml = result.mathml;
-			initial.expression = expression;
-			initial.expression_mathml = mathml;
-		})
-		.catch((error) => {
-			// Handle error appropriately
-			console.error('Error parsing expression:', error);
-		});
-}
-
-export function setInitialName(config: ModelConfiguration, initialId: string, name: string): void {
-	const initial = config.configuration.metadata?.initials?.[initialId];
-	if (initial) {
-		initial.name = name;
-	}
-}
-
-export function setInitialDescription(
-	config: ModelConfiguration,
-	initialId: string,
-	description: string
-): void {
-	const initial = config.configuration.metadata?.initials?.[initialId];
-	if (initial) {
-		initial.description = description;
-	}
-}
-
-export function getParameter(
-	config: ModelConfiguration,
-	parameterId: string
-): ModelParameter | undefined {
-	return config.configuration.semantics?.ode.parameters?.find((param) => param.id === parameterId);
-}
-
-export function getParameterName(config: ModelConfiguration, parameterId: string): string {
-	const parameter = getParameter(config, parameterId);
-	return parameter?.name ?? '';
-}
-
-export function getParameterDescription(config: ModelConfiguration, parameterId: string): string {
-	const parameter = getParameter(config, parameterId);
-	return parameter?.description ?? '';
-}
-
-export function getParameterUnit(config: ModelConfiguration, parameterId: string): string {
-	const parameter = getParameter(config, parameterId);
-	return parameter?.units?.expression ?? '';
-}
-
-export function getParameterDistribution(
-	config: ModelConfiguration,
-	parameterId: string
-): ModelDistribution {
-	const parameter = cloneDeep(getParameter(config, parameterId));
-
-	if (!parameter?.distribution) {
-		return {
-			type: DistributionType.Constant,
-			parameters: {
-				value: parameter?.value
-			}
-		};
-	}
-
-	if (parameter.distribution.type === 'Uniform1')
-		parameter.distribution.type = DistributionType.Uniform;
-
-	return parameter.distribution;
-}
-
-export function getInterventions(config: ModelConfiguration): Intervention[] {
-	return config.interventions ?? [];
-}
-
-// FIXME: for set and remove interventions, we should not be using the index.  This should be addressed when we move to the new model config data structure.
-export function setIntervention(
-	config: ModelConfiguration,
-	index: number,
-	intervention: Intervention
-): void {
-	const interventions = getInterventions(config);
-	interventions[index] = intervention;
-}
-
-export function removeIntervention(config: ModelConfiguration, index: number): void {
-	const interventions = getInterventions(config);
-	interventions.splice(index, 1);
-}
-
-export function getParameterSource(config: ModelConfiguration, parameterId: string): string {
-	return config.configuration.metadata?.parameters?.[parameterId]?.source ?? '';
-}
-
-export function setParameterSource(
-	config: ModelConfiguration,
-	parameterId: string,
-	source: string
-): void {
-	const parameter = config.configuration.metadata?.parameters?.[parameterId];
-	if (parameter) {
-		parameter.source = source;
-	}
-}
-
-export function setParameterDistribution(
-	config: ModelConfiguration,
-	parameterId: string,
-	distribution: ModelDistribution
-): void {
-	const parameter = getParameter(config, parameterId);
-	if (!parameter) return;
-
-	const type = distribution.type;
-	if (type === DistributionType.Constant) {
-		delete parameter.distribution;
-		parameter.value = distribution.parameters?.value ?? 0;
-	} else if (type === DistributionType.Uniform) {
-		parameter.distribution = convertToUniformDistribution(distribution);
-	}
-}
-
-function convertToUniformDistribution(distribution: ModelDistribution): ModelDistribution {
-	// if no parameters, initialize
-	if (isEmpty(distribution.parameters)) distribution.parameters = { minimum: 0, maximum: 0 };
-
-	return {
-		type: DistributionType.Uniform,
-		parameters: {
-			minimum: distribution.parameters.minimum,
-			maximum: distribution.parameters.maximum
-		}
-	};
-}
-
-export function getParameters(config: ModelConfiguration): ModelParameter[] {
-	return config.configuration.semantics?.ode.parameters ?? [];
-}
-
-export function getInitials(config: ModelConfiguration): Initial[] {
-	return config.configuration.semantics?.ode.initials ?? [];
-}
-
-export function setParameterDistributions(
-	config: ModelConfiguration,
-	distributionParameterMappings: { id: string; distribution: ModelDistribution }[]
-): void {
-	distributionParameterMappings.forEach((mapping) => {
-		setParameterDistribution(config, mapping.id, mapping.distribution);
-	});
-}
diff --git a/packages/client/hmi-client/src/services/model.ts b/packages/client/hmi-client/src/services/model.ts
index b8cab1c9fa..7eac0f608d 100644
--- a/packages/client/hmi-client/src/services/model.ts
+++ b/packages/client/hmi-client/src/services/model.ts
@@ -1,7 +1,7 @@
 import API from '@/api/api';
 import { useProjects } from '@/composables/project';
 import * as EventService from '@/services/event';
-import type { Initial, Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Initial, Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import { Artifact, AssetType, EventType } from '@/types/Types';
 import { AMRSchemaNames, ModelServiceType } from '@/types/common';
 import { fileToJson } from '@/utils/file';
@@ -75,9 +75,11 @@ export async function updateModel(model: Model) {
 	return response?.data ?? null;
 }
 
-export async function getModelConfigurations(modelId: Model['id']): Promise<ModelConfiguration[]> {
-	const response = await API.get(`/models/${modelId}/model-configurations`);
-	return response?.data ?? ([] as ModelConfiguration[]);
+export async function getModelConfigurations(
+	modelId: Model['id']
+): Promise<ModelConfigurationLegacy[]> {
+	const response = await API.get(`/models/${modelId}/model-configurations-legacy`);
+	return response?.data ?? ([] as ModelConfigurationLegacy[]);
 }
 
 export async function processAndAddModelToProject(artifact: Artifact): Promise<string | null> {
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 117750a67f..02d3729f9b 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -210,7 +210,7 @@ export interface Model extends TerariumAssetThatSupportsAdditionalProperties {
     metadata?: ModelMetadata;
 }
 
-export interface ModelConfiguration extends TerariumAssetThatSupportsAdditionalProperties {
+export interface ModelConfigurationLegacy extends TerariumAssetThatSupportsAdditionalProperties {
     configuration: Model;
     interventions?: Intervention[];
     model_id: string;
@@ -229,6 +229,42 @@ export interface ModelFramework extends TerariumAssetThatSupportsAdditionalPrope
     semantics: string;
 }
 
+export interface InitialSemantic extends Semantic {
+    target: string;
+    expression: string;
+    expressionMathml: string;
+    modelConfiguration: ModelConfiguration;
+}
+
+export interface ModelConfiguration extends TerariumAsset {
+    calibrationRunId: string;
+    modelId: string;
+    observableSemanticList: ObservableSemantic[];
+    parameterSemanticList: ParameterSemantic[];
+    initialSemanticList: InitialSemantic[];
+}
+
+export interface ObservableSemantic extends Semantic {
+    referenceId: string;
+    states: string[];
+    expression: string;
+    expressionMathml: string;
+    modelConfiguration: ModelConfiguration;
+}
+
+export interface ParameterSemantic extends Semantic {
+    referenceId: string;
+    distribution: ModelDistribution;
+    interventions: Intervention[];
+    default: boolean;
+    modelConfiguration: ModelConfiguration;
+}
+
+export interface Semantic extends TerariumEntity {
+    source: string;
+    type: SemanticType;
+}
+
 export interface State {
     id: string;
     name?: string;
@@ -882,6 +918,11 @@ export interface ModelMetadata {
 export interface TerariumAssetThatSupportsAdditionalProperties extends TerariumAsset {
 }
 
+export interface ModelDistribution {
+    type: string;
+    parameters: { [index: string]: any };
+}
+
 export interface ModelGrounding {
     identifiers: { [index: string]: any };
     context?: { [index: string]: any };
@@ -926,11 +967,6 @@ export interface ProvenanceEdge {
     right: ProvenanceNode;
 }
 
-export interface ModelDistribution {
-    type: string;
-    parameters: { [index: string]: any };
-}
-
 export interface XDDFacetsItemResponse {
     buckets: XDDFacetBucket[];
     doc_count_error_upper_bound: number;
@@ -1292,6 +1328,12 @@ export enum ColumnType {
     Time = "TIME",
 }
 
+export enum SemanticType {
+    Initial = "initial",
+    Parameter = "parameter",
+    Observable = "observable",
+}
+
 export enum ProvenanceRelationType {
     BeginsAt = "BEGINS_AT",
     Cites = "CITES",
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index cce381b42c..06732161b6 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -1,14 +1,15 @@
 package software.uncharted.terarium.hmiserver.controller.dataservice;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import jakarta.transaction.Transactional;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -27,137 +28,251 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.InitialSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ObservableSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ParameterSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Observable;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
-import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
+import software.uncharted.terarium.hmiserver.utils.Messages;
+import software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission;
 
 @RequestMapping("/model-configurations")
 @RestController
 @RequiredArgsConstructor
 @Slf4j
-@Transactional
 public class ModelConfigurationController {
-
 	final ModelConfigurationService modelConfigurationService;
-	final ObjectMapper objectMapper;
-
-	final ProjectService projectService;
+	final ModelService modelService;
 	final CurrentUserService currentUserService;
+	final Messages messages;
+	final ProjectService projectService;
+
+	private static final String CONSTANT_TYPE = "Constant";
+	private static final String VALUE_PARAM = "value";
 
+	/**
+	 * Gets all model configurations (which are visible to this user)
+	 *
+	 * @param pageSize how many entries per page
+	 * @param page page number
+	 * @return all model configurations visible to this user
+	 */
 	@GetMapping
 	@Secured(Roles.USER)
-	@Operation(summary = "Gets all model configurations")
+	@Operation(summary = "Gets all model configurations (which are visible to this user)")
 	@ApiResponses(
 			value = {
 				@ApiResponse(
 						responseCode = "200",
-						description = "Model configuration found.",
+						description = "model configurations found.",
 						content =
 								@Content(
 										array =
 												@ArraySchema(
-														schema =
-																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfiguration.class)))),
+														schema = @Schema(implementation = ModelConfiguration.class)))),
 				@ApiResponse(
-						responseCode = "500",
-						description = "There was an issue retrieving configuration from the data store",
+						responseCode = "204",
+						description = "There are no errors, but also no model configurations for this user",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
 						content = @Content)
 			})
 	public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
 			@RequestParam(name = "page-size", defaultValue = "500") final Integer pageSize,
-			@RequestParam(name = "page", defaultValue = "0") final Integer page) {
+			@RequestParam(name = "page", defaultValue = "1") final Integer page) {
 
 		try {
-			return ResponseEntity.ok(modelConfigurationService.getPublicNotTemporaryAssets(pageSize, page));
-		} catch (final IOException e) {
-			final String error = "Unable to get model configurations";
-			log.error(error, e);
-			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+			final List<ModelConfiguration> modelConfigurations =
+					modelConfigurationService.getPublicNotTemporaryAssets(pageSize, page);
+			if (modelConfigurations.isEmpty()) {
+				return ResponseEntity.noContent().build();
+			}
+
+			return ResponseEntity.ok(modelConfigurations);
+		} catch (final Exception e) {
+			log.error("Unable to get model configurations from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
 		}
 	}
 
-	@PostMapping
+	/**
+	 * Gets a specific model configuration by id
+	 *
+	 * @param id UUID of the specific model configuration to fetch
+	 * @param projectId the owning project ID
+	 * @return the requested model configuration
+	 */
+	@GetMapping("/{id}")
 	@Secured(Roles.USER)
-	@Operation(summary = "Create a new model configuration")
+	@Operation(summary = "Gets a specific model configuration by id")
 	@ApiResponses(
 			value = {
 				@ApiResponse(
-						responseCode = "201",
-						description = "Model configuration created.",
+						responseCode = "200",
+						description = "model configuration found.",
 						content =
 								@Content(
 										mediaType = "application/json",
-										schema =
-												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+										schema = @Schema(implementation = ModelConfiguration.class))),
 				@ApiResponse(
-						responseCode = "500",
-						description = "There was an issue creating the configuration",
+						responseCode = "404",
+						description = "There was no configuration found by this ID",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "403",
+						description = "User does not have permissions to this model configuration",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
 						content = @Content)
 			})
-	public ResponseEntity<ModelConfiguration> createModelConfiguration(
-			@RequestBody final ModelConfiguration config,
+	public ResponseEntity<ModelConfiguration> getModelConfiguration(
+			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		final Schema.Permission permission =
-				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
-
+		final Permission permission =
+				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 		try {
-			return ResponseEntity.status(HttpStatus.CREATED)
-					.body(modelConfigurationService.createAsset(config, permission));
-		} catch (final IOException e) {
-			final String error = "Unable to create model configuration";
-			log.error(error, e);
-			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
+			if (modelConfiguration.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
+			}
+			return ResponseEntity.ok(modelConfiguration.get());
+		} catch (final Exception e) {
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
 		}
 	}
 
-	@GetMapping("/{id}")
+	/**
+	 * Create a configured model from a model config
+	 *
+	 * @param id id of the model configuration
+	 * @param projectId associated project for permissions
+	 * @return configured model
+	 */
+	@GetMapping("/as-configured-model/{id}")
 	@Secured(Roles.USER)
-	@Operation(summary = "Gets a model configuration by ID")
+	@Operation(summary = "Gets a specific model configuration by id")
 	@ApiResponses(
 			value = {
 				@ApiResponse(
 						responseCode = "200",
-						description = "Model configuration found.",
+						description = "Configured model created",
 						content =
 								@Content(
 										mediaType = "application/json",
-										schema =
-												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+										schema = @Schema(implementation = Model.class))),
 				@ApiResponse(
 						responseCode = "404",
-						description = "There was no configuration found",
+						description = "There was no model or model configuration found by this ID",
 						content = @Content),
 				@ApiResponse(
-						responseCode = "500",
-						description = "There was an issue retrieving the configuration from the data store",
+						responseCode = "403",
+						description = "User does not have permissions to this model configuration",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
 						content = @Content)
 			})
-	public ResponseEntity<ModelConfiguration> getModelConfiguration(
+	public ResponseEntity<Model> getConfiguredModel(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		final Schema.Permission permission =
+		final Permission permission =
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
-
 		try {
+
 			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
-			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
-					.build());
+			if (modelConfiguration.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
+			}
+			final Optional<Model> model =
+					modelService.getAsset(modelConfiguration.get().getModelId(), permission);
+			if (model.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("model.not-found"));
+			}
+			setModelParameters(
+					model.get().getParameters(), modelConfiguration.get().getParameterSemanticList());
+			setModelInitials(model.get().getInitials(), modelConfiguration.get().getInitialSemanticList());
+			setModelObservables(
+					model.get().getObservables(), modelConfiguration.get().getObservableSemanticList());
+			return ResponseEntity.ok(model.get());
+
+		} catch (final Exception e) {
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+
+	/**
+	 * Creates a new model config and saves it to the DB
+	 *
+	 * @param modelConfiguration new model config to create
+	 * @param projectId owning project ID, used for permissions
+	 * @return newly created model config with id set.
+	 */
+	@PostMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Create a new model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "201",
+						description = "Model configuration created.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema = @Schema(implementation = ModelConfiguration.class))),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue creating the configuration",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfiguration> createModelConfiguration(
+			@RequestBody final ModelConfiguration modelConfiguration,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			return ResponseEntity.status(HttpStatus.CREATED)
+					.body(modelConfigurationService.createAsset(modelConfiguration, permission));
 		} catch (final IOException e) {
-			final String error = "Unable to get model configuration";
-			log.error(error, e);
-			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
 		}
 	}
 
+	/**
+	 * Updates an existing model config
+	 *
+	 * @param id UUID of the model to update
+	 * @param config New model config to update with
+	 * @param projectId owning project ID, used for permissions
+	 * @return updated project ID with UUID set
+	 */
 	@PutMapping("/{id}")
 	@Secured(Roles.USER)
-	@Operation(summary = "Update a model configuration")
+	@Operation(summary = "Create a new model configuration")
 	@ApiResponses(
 			value = {
 				@ApiResponse(
@@ -166,15 +281,13 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 						content =
 								@Content(
 										mediaType = "application/json",
-										schema =
-												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+										schema = @Schema(implementation = ModelConfiguration.class))),
 				@ApiResponse(
 						responseCode = "404",
-						description = "Model configuration could not be found",
+						description = "There was no model configuration found by this ID",
 						content = @Content),
 				@ApiResponse(
-						responseCode = "500",
+						responseCode = "503",
 						description = "There was an issue updating the configuration",
 						content = @Content)
 			})
@@ -182,24 +295,31 @@ public ResponseEntity<ModelConfiguration> updateModelConfiguration(
 			@PathVariable("id") final UUID id,
 			@RequestBody final ModelConfiguration config,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		final Schema.Permission permission =
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
-
 		try {
 			config.setId(id);
 			final Optional<ModelConfiguration> updated = modelConfigurationService.updateAsset(config, permission);
 			return updated.map(ResponseEntity::ok)
 					.orElseGet(() -> ResponseEntity.notFound().build());
 		} catch (final IOException e) {
-			final String error = "Unable to update model configuration";
-			log.error(error, e);
-			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+			log.error("Unable to update model configuration in postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
 		}
 	}
 
+	/**
+	 * Deletes a model config by id
+	 *
+	 * @param id id of the model config to delete
+	 * @param projectId ID of the owning project, for permissions
+	 * @return ResponseDeleted
+	 */
 	@DeleteMapping("/{id}")
 	@Secured(Roles.USER)
-	@Operation(summary = "Deletes an model configuration")
+	@Operation(summary = "Deletes a model configuration")
 	@ApiResponses(
 			value = {
 				@ApiResponse(
@@ -208,25 +328,84 @@ public ResponseEntity<ModelConfiguration> updateModelConfiguration(
 						content = {
 							@Content(
 									mediaType = "application/json",
-									schema =
-											@io.swagger.v3.oas.annotations.media.Schema(
-													implementation = ResponseDeleted.class))
+									schema = @Schema(implementation = ResponseDeleted.class))
 						}),
-				@ApiResponse(responseCode = "500", description = "An error occurred while deleting", content = @Content)
+				@ApiResponse(responseCode = "503", description = "An error occurred while deleting", content = @Content)
 			})
 	public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		final Schema.Permission permission =
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
 			modelConfigurationService.deleteAsset(id, permission);
 			return ResponseEntity.ok(new ResponseDeleted("ModelConfiguration", id));
 		} catch (final IOException e) {
-			final String error = "Unable to delete model configuration";
-			log.error(error, e);
-			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+			log.error("Unable to delete model configuration", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+
+	private void setModelParameters(
+			final List<ModelParameter> modelParameters, final List<ParameterSemantic> configParameters) {
+		// Create a map from ConfigParameter IDs to ConfigParameter objects
+		final Map<String, ParameterSemantic> configParameterMap = new HashMap<>();
+		for (final ParameterSemantic configParameter : configParameters) {
+			configParameterMap.put(configParameter.getReferenceId(), configParameter);
+		}
+
+		// Iterate through the list of ModelParameter objects
+		for (final ModelParameter modelParameter : modelParameters) {
+			// Look up the corresponding ConfigParameter in the map
+			final ParameterSemantic matchingConfigParameter = configParameterMap.get(modelParameter.getId());
+			if (matchingConfigParameter != null) {
+				// set distributions
+				if (CONSTANT_TYPE.equals(
+						matchingConfigParameter.getDistribution().getType())) {
+					modelParameter.setValue((Double) matchingConfigParameter
+							.getDistribution()
+							.getParameters()
+							.get(VALUE_PARAM));
+					modelParameter.setDistribution(null);
+				} else {
+					modelParameter.setDistribution(matchingConfigParameter.getDistribution());
+				}
+			}
+		}
+	}
+
+	private void setModelInitials(final List<Initial> modelInitials, final List<InitialSemantic> configInitials) {
+		final Map<String, InitialSemantic> configInitialMap = new HashMap<>();
+		for (final InitialSemantic configInitial : configInitials) {
+			configInitialMap.put(configInitial.getTarget(), configInitial);
+		}
+
+		for (final Initial modelInitial : modelInitials) {
+			final InitialSemantic matchingConfigInitial = configInitialMap.get(modelInitial.getTarget());
+			if (matchingConfigInitial != null) {
+				modelInitial.setExpression(matchingConfigInitial.getExpression());
+				modelInitial.setExpressionMathml(matchingConfigInitial.getExpressionMathml());
+			}
+		}
+	}
+
+	private void setModelObservables(
+			final List<Observable> modelObservables, final List<ObservableSemantic> configObservables) {
+		final Map<String, ObservableSemantic> configObservableMap = new HashMap<>();
+		for (final ObservableSemantic configObservable : configObservables) {
+			configObservableMap.put(configObservable.getReferenceId(), configObservable);
+		}
+
+		for (final Observable modelObservable : modelObservables) {
+			final ObservableSemantic matchingConfigObservable = configObservableMap.get(modelObservable.getId());
+			if (matchingConfigObservable != null) {
+				modelObservable.setStates(matchingConfigObservable.getStates());
+				modelObservable.setExpression(matchingConfigObservable.getExpression());
+				modelObservable.setExpressionMathml(matchingConfigObservable.getExpressionMathml());
+			}
 		}
 	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java
new file mode 100644
index 0000000000..356c933970
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java
@@ -0,0 +1,233 @@
+package software.uncharted.terarium.hmiserver.controller.dataservice;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
+import software.uncharted.terarium.hmiserver.security.Roles;
+import software.uncharted.terarium.hmiserver.service.CurrentUserService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
+import software.uncharted.terarium.hmiserver.service.data.ProjectService;
+import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
+
+@RequestMapping("/model-configurations-legacy")
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+public class ModelConfigurationLegacyController {
+
+	final ModelConfigurationLegacyService modelConfigurationService;
+	final ObjectMapper objectMapper;
+
+	final ProjectService projectService;
+	final CurrentUserService currentUserService;
+
+	@GetMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Gets all model configurations")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Model configuration found.",
+						content =
+								@Content(
+										array =
+												@ArraySchema(
+														schema =
+																@io.swagger.v3.oas.annotations.media.Schema(
+																		implementation =
+																				ModelConfigurationLegacy.class)))),
+				@ApiResponse(
+						responseCode = "500",
+						description = "There was an issue retrieving configuration from the data store",
+						content = @Content)
+			})
+	public ResponseEntity<List<ModelConfigurationLegacy>> getModelConfigurations(
+			@RequestParam(name = "page-size", defaultValue = "500") final Integer pageSize,
+			@RequestParam(name = "page", defaultValue = "0") final Integer page) {
+
+		try {
+			return ResponseEntity.ok(modelConfigurationService.getPublicNotTemporaryAssets(pageSize, page));
+		} catch (final IOException e) {
+			final String error = "Unable to get model configurations";
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
+
+	@PostMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Create a new model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "201",
+						description = "Model configuration created.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema =
+												@io.swagger.v3.oas.annotations.media.Schema(
+														implementation = ModelConfigurationLegacy.class))),
+				@ApiResponse(
+						responseCode = "500",
+						description = "There was an issue creating the configuration",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfigurationLegacy> createModelConfiguration(
+			@RequestBody final ModelConfigurationLegacy config,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			return ResponseEntity.status(HttpStatus.CREATED)
+					.body(modelConfigurationService.createAsset(config, permission));
+		} catch (final IOException e) {
+			final String error = "Unable to create model configuration";
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
+
+	@GetMapping("/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Gets a model configuration by ID")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Model configuration found.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema =
+												@io.swagger.v3.oas.annotations.media.Schema(
+														implementation = ModelConfigurationLegacy.class))),
+				@ApiResponse(
+						responseCode = "404",
+						description = "There was no configuration found",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "500",
+						description = "There was an issue retrieving the configuration from the data store",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfigurationLegacy> getModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Schema.Permission permission =
+				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
+
+		try {
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
+					modelConfigurationService.getAsset(id, permission);
+			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
+					.build());
+		} catch (final IOException e) {
+			final String error = "Unable to get model configuration";
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
+
+	@PutMapping("/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Update a model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Model configuration updated.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema =
+												@io.swagger.v3.oas.annotations.media.Schema(
+														implementation = ModelConfigurationLegacy.class))),
+				@ApiResponse(
+						responseCode = "404",
+						description = "Model configuration could not be found",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "500",
+						description = "There was an issue updating the configuration",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfigurationLegacy> updateModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestBody final ModelConfigurationLegacy config,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			config.setId(id);
+			final Optional<ModelConfigurationLegacy> updated =
+					modelConfigurationService.updateAsset(config, permission);
+			return updated.map(ResponseEntity::ok)
+					.orElseGet(() -> ResponseEntity.notFound().build());
+		} catch (final IOException e) {
+			final String error = "Unable to update model configuration";
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
+
+	@DeleteMapping("/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Deletes an model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Deleted configuration",
+						content = {
+							@Content(
+									mediaType = "application/json",
+									schema =
+											@io.swagger.v3.oas.annotations.media.Schema(
+													implementation = ResponseDeleted.class))
+						}),
+				@ApiResponse(responseCode = "500", description = "An error occurred while deleting", content = @Content)
+			})
+	public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			modelConfigurationService.deleteAsset(id, permission);
+			return ResponseEntity.ok(new ResponseDeleted("ModelConfiguration", id));
+		} catch (final IOException e) {
+			final String error = "Unable to delete model configuration";
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
index b35349c6d2..5a0429f7b5 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -39,7 +39,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.dataservice.document.DocumentAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelDescription;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelMetadata;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceQueryParam;
@@ -416,7 +416,7 @@ ResponseEntity<Model> createModel(
 		}
 	}
 
-	@GetMapping("/{id}/model-configurations")
+	@GetMapping("/{id}/model-configurations-legacy")
 	@Secured(Roles.USER)
 	@Operation(summary = "Gets all model configurations for a model")
 	@ApiResponses(
@@ -430,13 +430,14 @@ ResponseEntity<Model> createModel(
 												@ArraySchema(
 														schema =
 																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfiguration.class)))),
+																		implementation =
+																				ModelConfigurationLegacy.class)))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue retrieving configurations from the data store",
 						content = @Content)
 			})
-	ResponseEntity<List<ModelConfiguration>> getModelConfigurationsForModelId(
+	ResponseEntity<List<ModelConfigurationLegacy>> getModelConfigurationsForModelId(
 			@PathVariable("id") final UUID id,
 			@RequestParam(value = "page", required = false, defaultValue = "0") final int page,
 			@RequestParam(value = "page-size", required = false, defaultValue = "100") final int pageSize,
@@ -445,7 +446,7 @@ ResponseEntity<List<ModelConfiguration>> getModelConfigurationsForModelId(
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 
 		try {
-			final List<ModelConfiguration> modelConfigurations =
+			final List<ModelConfigurationLegacy> modelConfigurations =
 					modelService.getModelConfigurationsByModelId(id, page, pageSize);
 
 			modelConfigurations.forEach(config -> {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
index b31a462e88..eb1e46d722 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.controller.SnakeCaseController;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.ProgressState;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
@@ -34,7 +34,7 @@
 import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationServiceProxy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
@@ -58,7 +58,7 @@ public class SimulationRequestController implements SnakeCaseController {
 	private final SimulationService simulationService;
 
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigService;
+	private final ModelConfigurationLegacyService modelConfigService;
 
 	private final ObjectMapper objectMapper;
 
@@ -70,7 +70,7 @@ public class SimulationRequestController implements SnakeCaseController {
 	public ResponseEntity<Simulation> getSimulation(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 
 		try {
@@ -139,7 +139,7 @@ public ResponseEntity<Simulation> makeForecastRunCiemss(
 
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -149,13 +149,13 @@ public ResponseEntity<Simulation> makeForecastRunCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
@@ -207,11 +207,11 @@ public ResponseEntity<JobResponse> makeCalibrateJob(@RequestBody final Calibrati
 	@Secured(Roles.USER)
 	public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 			@RequestBody final CalibrationRequestCiemss request, @RequestParam("project-id") final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -221,13 +221,13 @@ public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
@@ -240,12 +240,12 @@ public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 	@Secured(Roles.USER)
 	public ResponseEntity<JobResponse> makeOptimizeJobCiemss(
 			@RequestBody final OptimizeRequestCiemss request, @RequestParam("project-id") final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -255,13 +255,13 @@ public ResponseEntity<JobResponse> makeOptimizeJobCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getFixedStaticParameterInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setFixedStaticParameterInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/AssetType.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/AssetType.java
index 9deded98f9..85284eb1d1 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/AssetType.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/AssetType.java
@@ -12,7 +12,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.dataservice.document.DocumentAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.workflow.Workflow;
 
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
index 8bc5a6ccf5..8ce966e656 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
@@ -24,6 +24,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelSemantics;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Observable;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -94,6 +95,12 @@ public Model clone() {
 		return clone;
 	}
 
+	@JsonIgnore
+	@TSIgnore
+	public List<Observable> getObservables() {
+		return this.getSemantics().getOde().getObservables();
+	}
+
 	@JsonIgnore
 	@TSIgnore
 	public List<ModelParameter> getParameters() {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
similarity index 91%
rename from packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java
rename to packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
index 6a8e0aefe2..3a136c9304 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
@@ -16,7 +16,7 @@
 @Data
 @Accessors(chain = true)
 @TSModel
-public class ModelConfiguration extends TerariumAssetThatSupportsAdditionalProperties {
+public class ModelConfigurationLegacy extends TerariumAssetThatSupportsAdditionalProperties {
 
 	@Serial
 	private static final long serialVersionUID = -4109896135386019667L;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
new file mode 100644
index 0000000000..dba0076a0e
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -0,0 +1,34 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Accessors
+@TSModel
+@Entity
+public class InitialSemantic extends Semantic {
+
+	@Column(columnDefinition = "text")
+	private String target;
+
+	@Column(columnDefinition = "text")
+	private String expression;
+
+	@Column(columnDefinition = "text")
+	private String expressionMathml;
+
+	@ManyToOne
+	@JsonBackReference
+	@Schema(hidden = true)
+	@NotNull private ModelConfiguration modelConfiguration;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
new file mode 100644
index 0000000000..874759f996
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -0,0 +1,37 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.TerariumAsset;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+@Entity
+public class ModelConfiguration extends TerariumAsset {
+	private UUID calibrationRunId;
+	private UUID modelId;
+
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@JsonManagedReference
+	private List<ObservableSemantic> observableSemanticList = new ArrayList<>();
+
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@JsonManagedReference
+	private List<ParameterSemantic> parameterSemanticList = new ArrayList<>();
+
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@JsonManagedReference
+	private List<InitialSemantic> initialSemanticList = new ArrayList<>();
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
new file mode 100644
index 0000000000..b96a35c796
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -0,0 +1,40 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.annotations.Type;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+@Entity
+public class ObservableSemantic extends Semantic {
+
+	private String referenceId;
+
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
+	private List<String> states;
+
+	@Column(columnDefinition = "text")
+	private String expression;
+
+	@Column(columnDefinition = "text")
+	private String expressionMathml;
+
+	@ManyToOne
+	@JsonBackReference
+	@Schema(hidden = true)
+	@NotNull private ModelConfiguration modelConfiguration;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
new file mode 100644
index 0000000000..e23e660072
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -0,0 +1,41 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.annotations.Type;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelDistribution;
+import software.uncharted.terarium.hmiserver.models.simulationservice.parts.Intervention;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+@Entity
+public class ParameterSemantic extends Semantic {
+
+	private String referenceId;
+
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
+	private ModelDistribution distribution;
+
+	private boolean isDefault;
+
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
+	private Intervention[] interventions;
+
+	@ManyToOne
+	@JsonBackReference
+	@Schema(hidden = true)
+	@NotNull private ModelConfiguration modelConfiguration;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
new file mode 100644
index 0000000000..806686f22c
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
@@ -0,0 +1,22 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.TerariumEntity;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Accessors
+@TSModel
+@Entity
+public abstract class Semantic extends TerariumEntity {
+
+	@Column(columnDefinition = "text")
+	private String source;
+
+	private SemanticType type;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java
new file mode 100644
index 0000000000..a181b7ab4c
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java
@@ -0,0 +1,14 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum SemanticType {
+	@JsonProperty("initial")
+	INITIAL,
+
+	@JsonProperty("parameter")
+	PARAMETER,
+
+	@JsonProperty("observable")
+	OBSERVABLE
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
new file mode 100644
index 0000000000..b7f5393491
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
@@ -0,0 +1,9 @@
+package software.uncharted.terarium.hmiserver.repository.data;
+
+import java.util.UUID;
+import org.springframework.stereotype.Repository;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.repository.PSCrudSoftDeleteRepository;
+
+@Repository
+public interface ModelConfigRepository extends PSCrudSoftDeleteRepository<ModelConfiguration, UUID> {}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationLegacyService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationLegacyService.java
new file mode 100644
index 0000000000..9274b3243e
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationLegacyService.java
@@ -0,0 +1,35 @@
+package software.uncharted.terarium.hmiserver.service.data;
+
+import io.micrometer.observation.annotation.Observed;
+import java.io.IOException;
+import java.util.UUID;
+import org.apache.http.entity.ContentType;
+import org.springframework.stereotype.Service;
+import software.uncharted.terarium.hmiserver.configuration.Config;
+import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
+import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
+
+@Service
+public class ModelConfigurationLegacyService extends TerariumAssetService<ModelConfigurationLegacy> {
+
+	public ModelConfigurationLegacyService(
+			final ElasticsearchConfiguration elasticConfig,
+			final Config config,
+			final ElasticsearchService elasticService,
+			final ProjectAssetService projectAssetService) {
+		super(elasticConfig, config, elasticService, projectAssetService, ModelConfigurationLegacy.class);
+	}
+
+	@Override
+	@Observed(name = "function_profile")
+	protected String getAssetIndex() {
+		return elasticConfig.getModelConfigurationIndex();
+	}
+
+	@Override
+	public Integer uploadFile(final UUID uuid, final String filename, final ContentType contentType, final byte[] data)
+			throws IOException {
+		throw new UnsupportedOperationException("Unimplemented");
+	}
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
index d20a38b88c..c27137d539 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
@@ -1,34 +1,26 @@
 package software.uncharted.terarium.hmiserver.service.data;
 
-import io.micrometer.observation.annotation.Observed;
-import java.io.IOException;
-import java.util.UUID;
-import org.apache.http.entity.ContentType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Service;
 import software.uncharted.terarium.hmiserver.configuration.Config;
-import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
-import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.repository.data.ModelConfigRepository;
+import software.uncharted.terarium.hmiserver.service.s3.S3ClientService;
 
 @Service
-public class ModelConfigurationService extends TerariumAssetService<ModelConfiguration> {
-
+public class ModelConfigurationService
+		extends TerariumAssetServiceWithoutSearch<ModelConfiguration, ModelConfigRepository> {
 	public ModelConfigurationService(
-			final ElasticsearchConfiguration elasticConfig,
+			final ObjectMapper objectMapper,
 			final Config config,
-			final ElasticsearchService elasticService,
-			final ProjectAssetService projectAssetService) {
-		super(elasticConfig, config, elasticService, projectAssetService, ModelConfiguration.class);
+			final ProjectAssetService projectAssetService,
+			final ModelConfigRepository repository,
+			final S3ClientService s3ClientService) {
+		super(objectMapper, config, projectAssetService, repository, s3ClientService, ModelConfiguration.class);
 	}
 
 	@Override
-	@Observed(name = "function_profile")
-	protected String getAssetIndex() {
-		return elasticConfig.getModelConfigurationIndex();
-	}
-
-	public Integer uploadFile(final UUID uuid, final String filename, final ContentType contentType, final byte[] data)
-			throws IOException {
-		throw new UnsupportedOperationException("Unimplemented");
+	protected String getAssetPath() {
+		throw new UnsupportedOperationException("Model Configurations are not stored in S3");
 	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
index 83727f340b..ed0170a5fc 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
@@ -16,7 +16,7 @@
 import software.uncharted.terarium.hmiserver.configuration.Config;
 import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelDescription;
 import software.uncharted.terarium.hmiserver.repository.data.ModelRepository;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
@@ -83,7 +83,7 @@ public Optional<ModelDescription> getDescription(final UUID id, final Schema.Per
 	}
 
 	@Observed(name = "function_profile")
-	public List<ModelConfiguration> getModelConfigurationsByModelId(
+	public List<ModelConfigurationLegacy> getModelConfigurationsByModelId(
 			final UUID id, final Integer page, final Integer pageSize) throws IOException {
 
 		final SearchRequest req = new SearchRequest.Builder()
@@ -101,7 +101,7 @@ public List<ModelConfiguration> getModelConfigurationsByModelId(
 						.build())
 				.build();
 
-		return elasticService.search(req, ModelConfiguration.class);
+		return elasticService.search(req, ModelConfigurationLegacy.class);
 	}
 
 	@Override
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
index d194053cb8..2d9f67f436 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
@@ -14,7 +14,7 @@ public class TerariumAssetServices {
 	private final CodeService codeService;
 	private final DatasetService datasetService;
 	private final DocumentAssetService documentAssetService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ModelService modelService;
 	private final NotebookSessionService notebookSessionService;
 	private final WorkflowService workflowService;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
index e6a4460904..e5cac008c0 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
@@ -11,14 +11,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.Provenance;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceRelationType;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceType;
 import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProvenanceService;
 import software.uncharted.terarium.hmiserver.service.gollm.ScenarioExtraction;
@@ -31,7 +31,7 @@ public class ConfigureFromDatasetResponseHandler extends TaskResponseHandler {
 
 	private final ObjectMapper objectMapper;
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ProvenanceService provenanceService;
 
 	@Override
@@ -86,7 +86,7 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 			}
 
 			// Create the new configuration
-			final ModelConfiguration configuration = new ModelConfiguration();
+			final ModelConfigurationLegacy configuration = new ModelConfigurationLegacy();
 			configuration.setModelId(model.getId());
 			configuration.setName("New configuration from dataset");
 			configuration.setDescription("");
@@ -94,7 +94,7 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 
 			try {
 				for (final UUID datasetId : props.datasetIds) {
-					final ModelConfiguration newConfig = modelConfigurationService.createAsset(
+					final ModelConfigurationLegacy newConfig = modelConfigurationService.createAsset(
 							configuration, ASSUME_WRITE_PERMISSION_ON_BEHALF_OF_USER);
 					// add provenance
 					provenanceService.createProvenance(new Provenance()
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
index d2b364642b..83f9a3a856 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
@@ -11,14 +11,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.Provenance;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceRelationType;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceType;
 import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProvenanceService;
 import software.uncharted.terarium.hmiserver.service.gollm.ScenarioExtraction;
@@ -31,7 +31,7 @@ public class ConfigureModelResponseHandler extends TaskResponseHandler {
 
 	private final ObjectMapper objectMapper;
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ProvenanceService provenanceService;
 
 	@Override
@@ -107,14 +107,14 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 				model.getMetadata().setGollmExtractions(gollmExtractions);
 
 				// Create the new configuration
-				final ModelConfiguration configuration = new ModelConfiguration();
+				final ModelConfigurationLegacy configuration = new ModelConfigurationLegacy();
 				configuration.setModelId(model.getId());
 				configuration.setName(condition.get("name").asText());
 				configuration.setDescription(condition.get("description").asText());
 
 				configuration.setConfiguration(modelCopy);
 
-				final ModelConfiguration newConfig =
+				final ModelConfigurationLegacy newConfig =
 						modelConfigurationService.createAsset(configuration, ASSUME_WRITE_PERMISSION_ON_BEHALF_OF_USER);
 				// add provenance
 				provenanceService.createProvenance(new Provenance()
diff --git a/packages/server/src/main/resources/messages.properties b/packages/server/src/main/resources/messages.properties
index ae08bdafbd..92f93e26d8 100644
--- a/packages/server/src/main/resources/messages.properties
+++ b/packages/server/src/main/resources/messages.properties
@@ -27,13 +27,16 @@ document.unable-to-update = We were unable to update the dataset document. Pleas
 document.text-length-exceeded = The length of this document exceeds the maximum allowed length of 600,000 words. Please contact support if you require this further analysis of this document.
 
 mit.service-unavailable = Terarium's text reading service (MIT-TR) is temporarily unavailable. Please try again later.
-mit.file.unable-to-read = An error occurred while trying to parce the supplied files. Please try again later.
+mit.file.unable-to-read = An error occurred while trying to parse the supplied files. Please try again later.
 mit.internal-error = An unknown error occurred in Terarium's text reading service (MIT-TR), and it was not able to produce valid information based on your supplied model and documentation. Please check that your inputs are valid and try again.
 
 model.not-found = We were unable to find the requested model. Please ensure that the model ID you supplied is correct or contact support.
 model.unable-to-delete = We were unable to delete the dataset model. Please try again later.
 model.unable-to-update = We were unable to update the dataset model. Please try again later.
 
+modelconfig.not-found = We were unable to find the requested model configuration. Please ensure that the model configuration ID you supplied is correct or contact support.
+
+
 postgres.service-unavailable = Terarium's data storage is temporarily unavailable. Please try again later.
 
 projects.asset-already-added = An asset with the same ID already exists in another project project. Please verify that the asset is not already in another project or contact support.
diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
index 77e24bce68..428332854d 100644
--- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
+++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
@@ -17,8 +17,8 @@
 import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
 import software.uncharted.terarium.hmiserver.configuration.MockUser;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
 
 public class ModelConfigurationControllerTests extends TerariumApplicationTests {
@@ -27,7 +27,7 @@ public class ModelConfigurationControllerTests extends TerariumApplicationTests
 	private ObjectMapper objectMapper;
 
 	@Autowired
-	private ModelConfigurationService modelConfigurationService;
+	private ModelConfigurationLegacyService modelConfigurationService;
 
 	@Autowired
 	private ElasticsearchService elasticService;
@@ -49,15 +49,15 @@ public void teardown() throws IOException {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanGetModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = modelConfigurationService.createAsset(
-				(ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = modelConfigurationService.createAsset(
+				(ModelConfigurationLegacy) new ModelConfigurationLegacy()
 						.setModelId(UUID.randomUUID())
 						.setConfiguration(new Model())
 						.setName("test-framework")
 						.setDescription("test-desc"),
 				ASSUME_WRITE_PERMISSION);
 
-		mockMvc.perform(MockMvcRequestBuilders.get("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.get("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf()))
 				.andExpect(status().isOk());
@@ -67,13 +67,13 @@ public void testItCanGetModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanCreateModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = (ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = (ModelConfigurationLegacy) new ModelConfigurationLegacy()
 				.setModelId(UUID.randomUUID())
 				.setConfiguration(new Model())
 				.setDescription("test-desc")
 				.setName("test-framework");
 
-		mockMvc.perform(MockMvcRequestBuilders.post("/model-configurations")
+		mockMvc.perform(MockMvcRequestBuilders.post("/model-configurations-legacy")
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf())
 						.contentType("application/json")
@@ -85,15 +85,15 @@ public void testItCanCreateModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanUpdateModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = modelConfigurationService.createAsset(
-				(ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = modelConfigurationService.createAsset(
+				(ModelConfigurationLegacy) new ModelConfigurationLegacy()
 						.setModelId(UUID.randomUUID())
 						.setConfiguration(new Model())
 						.setDescription("test-desc")
 						.setName("test-framework"),
 				ASSUME_WRITE_PERMISSION);
 
-		mockMvc.perform(MockMvcRequestBuilders.put("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.put("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf())
 						.contentType("application/json")
@@ -105,13 +105,13 @@ public void testItCanUpdateModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanDeleteModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = (ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = (ModelConfigurationLegacy) new ModelConfigurationLegacy()
 				.setModelId(UUID.randomUUID())
 				.setConfiguration(new Model())
 				.setDescription("test-desc")
 				.setName("test-framework");
 
-		mockMvc.perform(MockMvcRequestBuilders.delete("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.delete("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf()))
 				.andExpect(status().isOk());