diff --git a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
index 5fc7a232c3..e6cee184ad 100644
--- a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
+++ b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-section.vue
@@ -53,6 +53,7 @@ section {
 	flex-direction: column;
 	gap: 0.75rem;
 	overflow: hidden;
+	height: 100%;
 }
 main {
 	display: flex;
diff --git a/packages/client/hmi-client/src/components/drilldown/tera-drilldown.vue b/packages/client/hmi-client/src/components/drilldown/tera-drilldown.vue
index 4a993b4776..3768e9b519 100644
--- a/packages/client/hmi-client/src/components/drilldown/tera-drilldown.vue
+++ b/packages/client/hmi-client/src/components/drilldown/tera-drilldown.vue
@@ -180,21 +180,6 @@ than the main application behind the modal when these render issues come, howeve
 	}
 }
 
-main {
-	flex-grow: 1;
-	padding: 0;
-	gap: var(--gap);
-}
-
-main > :deep(*) {
-	display: grid;
-	grid-auto-flow: column;
-	height: 100%;
-	grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
-	gap: 0.5rem;
-	overflow: hidden;
-}
-
 footer {
 	padding: 0 1.5rem 1rem 1.5rem;
 	display: flex;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue
index 0ed1bfcba2..ee2ee37340 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue
@@ -3,7 +3,7 @@
 		<template #header>
 			<div class="flex align-items-center justify-space-between">
 				<h4 class="w-full">{{ id }} matrix</h4>
-				<div class="flex align-items-center gap-2 white-space-nowrap">
+				<div v-if="!isReadOnly" class="flex align-items-center gap-2 white-space-nowrap">
 					<label for="matrixShouldEval" class="mr-2">Evaluate expressions</label>
 					<InputSwitch
 						inputId="matrixShouldEval"
@@ -22,6 +22,7 @@
 			/>
 		</template>
 		<template #footer>
+			<!--FIXME: This design is odd, since these buttons do the same thing-->
 			<Button size="large" label="OK" @click="emit('close-modal')" />
 			<Button
 				size="large"
@@ -48,6 +49,7 @@ const props = defineProps<{
 	mmtParams: MiraTemplateParams;
 	id: string;
 	stratifiedMatrixType: StratifiedMatrix;
+	isReadOnly?: boolean;
 }>();
 
 const emit = defineEmits(['close-modal', 'update-cell-value']);
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue
index 28e10c0afa..84450fd7c3 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-matrix.vue
@@ -37,27 +37,23 @@
 							@keyup.enter="onEnterValueCell(cell.content.id, rowIdx, colIdx)"
 							@click="onEnterValueCell(cell.content.id, rowIdx, colIdx)"
 						>
-							<template v-if="cell.content.id">
-								<section class="flex flex-column">
-									<InputText
-										v-if="editableCellStates[rowIdx][colIdx]"
-										class="cell-input"
-										:class="stratifiedMatrixType !== StratifiedMatrix.Initials && 'big-cell-input'"
-										v-model.lazy="valueToEdit"
-										v-focus
-										@focusout="updateCellValue(cell.content.id, rowIdx, colIdx)"
-										@keyup.stop.enter="updateCellValue(cell.content.id, rowIdx, colIdx)"
-									/>
+							<section v-if="cell.content.id" class="flex flex-column">
+								<InputText
+									v-if="editableCellStates[rowIdx][colIdx]"
+									class="cell-input"
+									:class="stratifiedMatrixType !== StratifiedMatrix.Initials && 'big-cell-input'"
+									v-model.lazy="valueToEdit"
+									v-focus
+									@focusout="updateCellValue(cell.content.id, rowIdx, colIdx)"
+									@keyup.stop.enter="updateCellValue(cell.content.id, rowIdx, colIdx)"
+								/>
+								<div class="w-full" :class="{ 'hide-content': editableCellStates[rowIdx][colIdx] }">
 									<div
-										class="w-full"
-										:class="{ 'hide-content': editableCellStates[rowIdx][colIdx] }"
+										class="subdue mb-1 flex align-items-center gap-1 w-full justify-content-between"
+										v-if="stratifiedMatrixType !== StratifiedMatrix.Initials"
 									>
-										<div
-											class="subdue mb-1 flex align-items-center gap-1 w-full justify-content-between"
-											v-if="stratifiedMatrixType !== StratifiedMatrix.Initials"
-										>
-											{{ cell?.content.id }}
-											<!--
+										{{ cell?.content.id }}
+										<!--
 											<span
 												v-if="cell?.content?.controllers"
 												class="pi pi-info-circle"
@@ -67,16 +63,14 @@
 												}"
 											/>
 											-->
-										</div>
-										<div>
-											<div
-												class="mathml-container"
-												v-html="expressionMap[rowIdx + ':' + colIdx] ?? '...'"
-											/>
-										</div>
 									</div>
-								</section>
-							</template>
+									<div
+										v-if="!isReadOnly"
+										class="mathml-container"
+										v-html="expressionMap[rowIdx + ':' + colIdx] ?? '...'"
+									/>
+								</div>
+							</section>
 							<span v-else class="subdue">n/a</span>
 						</td>
 					</tr>
@@ -108,6 +102,7 @@ const props = defineProps<{
 	mmtParams: MiraTemplateParams;
 	id: string;
 	stratifiedMatrixType: StratifiedMatrix;
+	isReadOnly?: boolean;
 	shouldEval: boolean;
 	matrixType?: string;
 }>();
@@ -145,7 +140,7 @@ const vFocus = {
 };
 
 function onEnterValueCell(variableName: string, rowIdx: number, colIdx: number) {
-	if (!variableName) return;
+	if (!variableName || props.isReadOnly) return;
 	valueToEdit.value = getVariable(props.mmt, variableName).value;
 	editableCellStates.value[rowIdx][colIdx] = true;
 }
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
deleted file mode 100644
index 2e8d860e54..0000000000
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<Accordion v-if="isStratified" multiple>
-		<AccordionTab v-for="[key, values] in collapseInitials(props.mmt).entries()" :key="key">
-			<template #header>
-				<span>{{ key }}</span>
-				<Button label="Open Matrix" text size="small" @click.stop="matrixModalId = key" />
-			</template>
-			<div class="flex">
-				<Divider layout="vertical" type="solid" />
-				<ul>
-					<li v-for="initial in values" :key="initial">
-						<tera-initial-entry
-							:model="model"
-							:model-configuration="props.modelConfiguration"
-							:initial-id="initial"
-							@update-expression="emit('update-expression', $event)"
-							@update-source="emit('update-source', $event)"
-						/>
-						<Divider type="solid" />
-					</li>
-				</ul>
-			</div>
-		</AccordionTab>
-	</Accordion>
-
-	<!-- Unstratified -->
-	<ul v-else class="flex-grow">
-		<li v-for="{ target } in getInitials(modelConfiguration)" :key="target">
-			<tera-initial-entry
-				:model="model"
-				:model-configuration="modelConfiguration"
-				:initial-id="target"
-				@update-expression="emit('update-expression', $event)"
-				@update-source="emit('update-source', $event)"
-			/>
-			<Divider type="solid" />
-		</li>
-	</ul>
-	<!-- Stratified -->
-
-	<Teleport to="body">
-		<tera-stratified-matrix-modal
-			v-if="matrixModalId && isStratified"
-			:id="matrixModalId"
-			:mmt="mmt"
-			:mmt-params="mmtParams"
-			:stratified-matrix-type="StratifiedMatrix.Initials"
-			:open-value-config="!!matrixModalId"
-			@close-modal="matrixModalId = ''"
-			@update-cell-value="
-				emit('update-expression', { id: $event.variableName, value: $event.newValue })
-			"
-		/>
-	</Teleport>
-</template>
-
-<script setup lang="ts">
-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';
-import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
-import Accordion from 'primevue/accordion';
-import AccordionTab from 'primevue/accordiontab';
-import Button from 'primevue/button';
-import Divider from 'primevue/divider';
-import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
-import TeraInitialEntry from './tera-initial-entry.vue';
-
-const props = defineProps<{
-	modelConfiguration: ModelConfigurationLegacy;
-	model: Model;
-	mmt: MiraModel;
-	mmtParams: MiraTemplateParams;
-}>();
-
-const emit = defineEmits(['update-expression', 'update-source']);
-
-const isStratified = isStratifiedModel(props.mmt);
-
-const matrixModalId = ref('');
-</script>
-
-<style scoped>
-ul {
-	flex-grow: 1;
-	li {
-		list-style: none;
-	}
-}
-
-.artifact-amount {
-	font-size: var(--font-caption);
-	color: var(--text-color-subdued);
-	margin-left: 0.25rem;
-}
-
-:deep(.p-divider) {
-	&.p-divider-horizontal {
-		margin-top: 0;
-		margin-bottom: var(--gap);
-		color: var(--gray-300);
-	}
-	&.p-divider-vertical {
-		margin-left: var(--gap-small);
-		margin-right: var(--gap);
-	}
-}
-</style>
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
index 9e9c5595b3..562d66deec 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
@@ -1,518 +1,109 @@
 <template>
-	<Datatable
-		:value="data ?? tableFormattedInitials"
-		v-model:expanded-rows="expandedRows"
-		dataKey="id"
-		:row-class="rowClass"
-		size="small"
-		:class="{ 'hide-header': hideHeader }"
-		edit-mode="cell"
-		@cell-edit-complete="conceptSearchTerm = { curie: '', name: '' }"
-	>
-		<!-- Row expander, ID and Name columns -->
-		<Column expander class="w-3rem" />
-
-		<!-- Symbol -->
-		<Column header="Symbol" class="w-2">
-			<template #body="slotProps">
-				<span class="truncate-text latex-font">
-					{{ slotProps.data.id }}
-				</span>
-			</template>
-		</Column>
-
-		<!-- Name -->
-		<Column header="Name">
-			<template #body="{ data }">
-				<InputText
-					v-model.lazy="data.name"
-					:disabled="configView || readonly || data.type === ParamType.MATRIX"
-					@update:model-value="updateMetadataFromInput(data.value.target, 'name', $event)"
-				/>
-			</template>
-		</Column>
-
-		<Column header="Description" class="w-2">
-			<template #body="slotProps">
-				<InputText
-					v-model.lazy="slotProps.data.description"
-					:disabled="configView || readonly || slotProps.data.type === ParamType.MATRIX"
-					@update:model-value="
-						updateMetadataFromInput(slotProps.data.value.target, 'description', $event)
-					"
-				/>
-			</template>
-		</Column>
-
-		<Column header="Concept" class="w-1">
-			<template #body="{ data }">
-				<template v-if="data.concept?.identifiers && !isEmpty(data.concept.identifiers)">
-					{{
-						getNameOfCurieCached(
-							nameOfCurieCache,
-							getCurieFromGroundingIdentifier(data.concept.identifiers)
-						)
-					}}
-
-					<a
-						target="_blank"
-						rel="noopener noreferrer"
-						:href="getCurieUrl(getCurieFromGroundingIdentifier(data.concept.identifiers))"
-						@click.stop
-						aria-label="Open Concept"
-					>
-						<i class="pi pi-external-link" />
-					</a>
-				</template>
-				<template v-else>--</template>
-			</template>
-			<template v-if="!configView && !readonly" #editor="{ data }">
-				<AutoComplete
-					v-model="conceptSearchTerm.name"
-					:suggestions="curies"
-					@complete="onSearch"
-					@item-select="
-						updateMetadataFromInput(data.value.target, 'concept', {
-							grounding: { identifiers: parseCurie($event.value.curie) }
-						})
-					"
-					optionLabel="name"
-					:forceSelection="true"
-					:inputStyle="{ width: '100%' }"
-				/>
-			</template>
-		</Column>
-
-		<Column header="Unit" class="w-1">
-			<template #body="slotProps">
-				<InputText
-					v-if="slotProps.data.type === ParamType.CONSTANT"
-					class="w-full"
-					:disabled="readonly"
-					v-model.lazy="slotProps.data.unit"
-					@update:model-value="
-						(val) => updateMetadataFromInput(slotProps.data.value.target, 'unit', val)
-					"
-				/>
-				<template v-else>--</template>
-			</template>
-		</Column>
-
-		<!-- Value type: Matrix or Expression -->
-		<Column field="type" header="Value Type" class="w-2">
-			<template #body="slotProps">
-				<Button
-					text
-					v-if="slotProps.data.type === ParamType.MATRIX"
-					icon="pi pi-table"
-					label="Matrix"
-					@click="openMatrixModal(slotProps.data)"
-					class="p-0"
-				/>
-				<Dropdown
-					v-else
-					class="value-type-dropdown w-9"
-					:model-value="slotProps.data.type"
-					:options="typeOptions"
-					optionLabel="label"
-					optionValue="value"
-					placeholder="Select a parameter type"
-					:disabled="readonly"
-					@update:model-value="
-						(val) => updateMetadataFromInput(slotProps.data.value.target, 'expression', val)
-					"
-				>
-					<template #value="slotProps">
-						<span class="flex align-items-center">
-							<span
-								class="p-dropdown-item-icon mr-2"
-								:class="typeOptions.find((op) => slotProps.value === op.value)?.icon"
-							></span>
-							<span>{{ typeOptions.find((op) => slotProps.value === op.value)?.label }}</span>
-						</span>
-					</template>
-					<template #option="slotProps">
-						<span class="flex align-items-center">
-							<span class="p-dropdown-item-icon mr-2" :class="slotProps.option.icon"></span>
-							<span>{{ slotProps.option.label }}</span>
-						</span>
-					</template>
-				</Dropdown>
-			</template>
-		</Column>
-
-		<!-- Value: the thing we show depends on the type of number -->
-		<Column field="value" class="w-2 pr-2">
+	<Accordion v-if="isStratified" multiple>
+		<AccordionTab v-for="[key, values] in collapseInitials(props.mmt).entries()" :key="key">
 			<template #header>
-				<span>Value</span>
-				<span class="evaluate-toggle">
-					<label>Evaluate</label>
-					<InputSwitch v-if="!isStratified" v-model="areExpressionsEvaluated" :binary="true" />
-				</span>
-			</template>
-			<template #body="slotProps">
-				<!-- Matrix -->
-				<span
-					v-if="slotProps.data.type === ParamType.MATRIX"
-					@click="openMatrixModal(slotProps.data)"
-					class="cursor-pointer secondary-text text-sm"
-					>Open matrix</span
-				>
-				<!-- Expression -->
-				<template
-					v-else-if="
-						slotProps.data.type === ParamType.EXPRESSION ||
-						slotProps.data.type === ParamType.CONSTANT
-					"
-				>
-					<InputText
-						v-if="!areExpressionsEvaluated"
-						class="tabular-numbers w-full"
-						v-model.lazy="slotProps.data.value.expression"
-						:disabled="readonly"
-						@update:model-value="updateExpression(slotProps.data.value)"
-					/>
-					<span v-else>
-						{{ evaluatedExpressions.get(slotProps.data.value.expression) }}
-					</span>
-				</template>
-			</template>
-		</Column>
-
-		<!-- Source  -->
-		<Column field="source" header="Source" class="w-2">
-			<template #body="{ data }">
-				<InputText
-					v-if="data.type === ParamType.CONSTANT"
-					class="w-full"
-					v-model.lazy="data.source"
-					:disabled="readonly"
-					@update:model-value="(val) => updateMetadataFromInput(data.value.target, 'source', val)"
-				/>
+				<span>{{ key }}</span>
+				<Button label="Open Matrix" text size="small" @click.stop="matrixModalId = key" />
 			</template>
-		</Column>
-		<!-- Hiding for now until functionality is available
-		<Column field="visibility" header="Visibility" style="width: 10%">
-			<template #body="slotProps">
-				<InputSwitch v-model="slotProps.data.visibility" @click.stop />
-			</template>
-		</Column> -->
-		<template #expansion="slotProps">
-			<tera-initial-table
-				hide-header
-				v-if="slotProps.data.type === ParamType.MATRIX"
+			<div class="flex">
+				<Divider layout="vertical" type="solid" />
+				<ul>
+					<li v-for="initial in values" :key="initial">
+						<tera-initial-entry
+							:model="model"
+							:model-configuration="props.modelConfiguration"
+							:initial-id="initial"
+							@update-expression="emit('update-expression', $event)"
+							@update-source="emit('update-source', $event)"
+						/>
+						<Divider type="solid" />
+					</li>
+				</ul>
+			</div>
+		</AccordionTab>
+	</Accordion>
+
+	<!-- Unstratified -->
+	<ul v-else class="flex-grow">
+		<li v-for="{ target } in getInitials(modelConfiguration)" :key="target">
+			<tera-initial-entry
 				:model="model"
-				:mmt="mmt"
-				:mmt-params="mmtParams"
-				:data="slotProps.data.tableFormattedMatrix"
-				:config-view="configView"
-				:readonly="readonly"
-				@update-value="(val: Initial) => emit('update-value', [val])"
-				@update-model="(model: Model) => emit('update-model', model)"
+				:model-configuration="modelConfiguration"
+				:initial-id="target"
+				@update-expression="emit('update-expression', $event)"
+				@update-source="emit('update-source', $event)"
 			/>
-		</template>
-	</Datatable>
+			<Divider type="solid" />
+		</li>
+	</ul>
+	<!-- Stratified -->
+
 	<Teleport to="body">
 		<tera-stratified-matrix-modal
-			v-if="matrixModalContext.isOpen && isStratified"
-			:id="matrixModalContext.matrixId"
+			v-if="matrixModalId && isStratified"
+			:id="matrixModalId"
 			:mmt="mmt"
 			:mmt-params="mmtParams"
 			:stratified-matrix-type="StratifiedMatrix.Initials"
-			:open-value-config="matrixModalContext.isOpen"
-			@close-modal="matrixModalContext.isOpen = false"
-			@update-cell-value="(configToUpdate: any) => updateCellValue(configToUpdate)"
+			@close-modal="matrixModalId = ''"
+			@update-cell-value="
+				emit('update-expression', { id: $event.variableName, value: $event.newValue })
+			"
 		/>
 	</Teleport>
 </template>
 
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import { cloneDeep, isEmpty } from 'lodash';
-import Button from 'primevue/button';
-import type { Model, Initial, DKG } from '@/types/Types';
-import Datatable from 'primevue/datatable';
-import Column from 'primevue/column';
-import Dropdown from 'primevue/dropdown';
-import InputText from 'primevue/inputtext';
-
-import TeraStratifiedMatrixModal from '@/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue';
+import { Model, ModelConfigurationLegacy } from '@/types/Types';
+import { getInitials } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
-import { ModelConfigTableData, ParamType } from '@/types/common';
-import { pythonInstance } from '@/python/PyodideController';
-import {
-	getCurieFromGroundingIdentifier,
-	getCurieUrl,
-	getNameOfCurieCached,
-	searchCuriesEntities,
-	parseCurie
-} from '@/services/concept';
-import { getUnstratifiedInitials } from '@/model-representation/petrinet/mira-petri';
+import { ref } from 'vue';
+import { collapseInitials, isStratifiedModel } from '@/model-representation/mira/mira';
 import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
-import { isStratifiedModel } from '@/model-representation/mira/mira';
-import { matrixEffect } from '@/utils/easter-eggs';
-import {
-	getInitials,
-	updateVariable,
-	updateInitialMetadata,
-	getInitialMetadata
-} from '@/model-representation/service';
-import AutoComplete, { AutoCompleteCompleteEvent } from 'primevue/autocomplete';
-import InputSwitch from 'primevue/inputswitch';
-
-const typeOptions = [
-	{ label: 'Constant', value: ParamType.CONSTANT, icon: 'pi pi-hashtag' },
-	{ label: 'Expression', value: ParamType.EXPRESSION, icon: 'custom-icon-expression' }
-];
+import Accordion from 'primevue/accordion';
+import AccordionTab from 'primevue/accordiontab';
+import Button from 'primevue/button';
+import Divider from 'primevue/divider';
+import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
+import TeraInitialEntry from './tera-initial-entry.vue';
 
 const props = defineProps<{
+	modelConfiguration: ModelConfigurationLegacy;
 	model: Model;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
-	data?: ModelConfigTableData[];
-	hideHeader?: boolean;
-	readonly?: boolean;
-	configView?: boolean;
 }>();
 
-const emit = defineEmits(['update-value', 'update-model']);
-
-const areExpressionsEvaluated = ref(false);
-const evaluatedExpressions = ref(new Map<string, string>());
-
-const matrixModalContext = ref({
-	isOpen: false,
-	matrixId: ''
-});
-
-const curies = ref<DKG[]>([]);
-const conceptSearchTerm = ref({
-	curie: '',
-	name: ''
-});
-const nameOfCurieCache = ref(new Map<string, string>());
+const emit = defineEmits(['update-expression', 'update-source']);
 
-const expandedRows = ref([]);
-
-const initials = computed<Map<string, string[]>>(() => {
-	const result = new Map<string, string[]>();
-	if (!props.mmt) return result;
-
-	const model = props.model;
-	if (isStratified.value) {
-		return getUnstratifiedInitials(model);
-	}
-	model.semantics?.ode.initials?.forEach((initial) => {
-		result.set(initial.target, [initial.target]);
-	});
-	return result;
-});
-
-const isStratified = computed(() => {
-	if (!props.mmt) return false;
-	return isStratifiedModel(props.mmt);
-});
-
-const parametersValueMap = computed(() => {
-	const keys = Object.keys(props.mmt.parameters);
-	const result: any = {};
-	keys.forEach((key) => {
-		result[key] = props.mmt.parameters[key].value;
-	});
-	return result;
-});
-
-const tableFormattedInitials = computed<ModelConfigTableData[]>(() => {
-	const model = props.model;
-	const formattedInitials: ModelConfigTableData[] = [];
-
-	if (isStratified.value) {
-		initials.value.forEach((vals, init) => {
-			const tableFormattedMatrix: ModelConfigTableData[] = vals.map((v) => {
-				const initial = getInitials(model).find((i) => i.target === v);
-				const initialsMetadata = getInitialMetadata(model, initial!.target);
-				const sourceValue = initialsMetadata?.source;
-				const unitValue = initialsMetadata?.unit;
-				const nameValue = initialsMetadata?.name;
-				const descriptionValue = initialsMetadata?.description;
-				const conceptValue = initialsMetadata?.concept;
-				const expressionValue = initialsMetadata?.expression;
-				return {
-					id: v,
-					name: nameValue,
-					description: descriptionValue,
-					concept: conceptValue?.grounding,
-					type: expressionValue ? ParamType.EXPRESSION : ParamType.CONSTANT,
-					unit: unitValue,
-					value: initial,
-					source: sourceValue,
-					visibility: false
-				};
-			});
-			formattedInitials.push({
-				id: init,
-				name: init,
-				description: '',
-				concept: { identifiers: {} },
-				type: ParamType.MATRIX,
-				value: 'matrix',
-				source: '',
-				visibility: false,
-				tableFormattedMatrix
-			});
-		});
-	} else {
-		initials.value.forEach((vals, init) => {
-			const initial = getInitials(model).find((i) => i.target === vals[0]);
-			const initialsMetadata = getInitialMetadata(model, initial!.target);
-			const sourceValue = initialsMetadata?.source;
-			const unitValue = initialsMetadata?.unit;
-			const nameValue = initialsMetadata?.name;
-			const descriptionValue = initialsMetadata?.description;
-			const conceptValue = initialsMetadata?.concept;
-			const expressionValue = initialsMetadata?.expression;
-
-			formattedInitials.push({
-				id: init,
-				name: nameValue,
-				description: descriptionValue,
-				concept: conceptValue?.grounding,
-				type: expressionValue ? ParamType.EXPRESSION : ParamType.CONSTANT,
-				unit: unitValue,
-				value: initial,
-				source: sourceValue,
-				visibility: false
-			});
-		});
-	}
+const isStratified = isStratifiedModel(props.mmt);
 
-	return formattedInitials;
-});
-
-const openMatrixModal = (datum: ModelConfigTableData) => {
-	matrixEffect();
-
-	const id = datum.id;
-	if (!datum.tableFormattedMatrix) return;
-	matrixModalContext.value = {
-		isOpen: true,
-		matrixId: id
-	};
-};
-
-const rowClass = (rowData) => (rowData.type === ParamType.MATRIX ? '' : 'no-expander');
-
-const updateCellValue = (v: any) => {
-	const clone = cloneDeep(props.model);
-	updateVariable(clone, 'initials', v.variableName, v.newValue, v.mathml);
-	emit('update-model', clone);
-};
-
-const updateMetadataFromInput = (id: string, key: string, value: any) => {
-	const clone = cloneDeep(props.model);
-	updateInitialMetadata(clone, id, key, value);
-	emit('update-model', clone);
-};
-
-async function evaluateExpression(expression: string) {
-	return pythonInstance.evaluateExpression(expression, parametersValueMap.value);
-}
-
-const initialExpressions = computed<string[]>(() =>
-	tableFormattedInitials.value.map((i) => i.value.expression)
-);
-
-watch(
-	() => initialExpressions.value,
-	async () => {
-		evaluatedExpressions.value.clear();
-		initialExpressions.value.forEach(async (expression) => {
-			const newExpression = await evaluateExpression(expression);
-			evaluatedExpressions.value.set(expression, newExpression);
-		});
-	}
-);
-
-const updateExpression = async (value: Initial) => {
-	const mathml = (await pythonInstance.parseExpression(value.expression)).mathml;
-	value.expression_mathml = mathml;
-	emit('update-value', [value]);
-};
-async function onSearch(event: AutoCompleteCompleteEvent) {
-	const query = event.query;
-	if (query.length > 2) {
-		const response = await searchCuriesEntities(query);
-		curies.value = response;
-	}
-}
+const matrixModalId = ref('');
 </script>
 
 <style scoped>
-.truncate-text {
-	display: flex;
-	width: 10rem;
-}
-
-.evaluate-toggle {
-	margin-left: auto;
-	font-weight: var(--font-weight);
-	font-size: var(--font-tiny);
-	display: flex;
-	flex-direction: column;
-	align-items: end;
-	gap: var(--gap-xsmall);
-
-	& > .p-inputswitch {
-		scale: 0.75;
+ul {
+	flex-grow: 1;
+	li {
+		list-style: none;
 	}
 }
 
-.p-datatable.p-datatable-sm :deep(.p-datatable-tbody > tr > td) {
-	padding: 0;
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander > td .p-row-toggler) {
-	visibility: hidden;
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander) {
-	background: var(--surface-0);
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander > td) {
-	padding: 0;
-}
-
-.hide-header :deep(.p-datatable-thead) {
-	display: none;
-}
-
-.constant-number > :deep(input) {
-	font-feature-settings: 'tnum';
+.artifact-amount {
 	font-size: var(--font-caption);
-	text-align: right;
-}
-
-.tabular-numbers {
-	font-feature-settings: 'tnum';
-	font-size: var(--font-caption);
-	text-align: right;
-}
-
-.custom-icon-expression {
-	background-image: url('@assets/svg/icons/expression.svg');
-	background-size: contain;
-	background-repeat: no-repeat;
-	display: inline-block;
-	width: 1rem;
-	height: 1rem;
-}
-
-.secondary-text {
 	color: var(--text-color-subdued);
+	margin-left: 0.25rem;
 }
 
-.value-type-dropdown {
-	min-width: 10rem;
+:deep(.p-divider) {
+	&.p-divider-horizontal {
+		margin-top: 0;
+		margin-bottom: var(--gap);
+		color: var(--gray-300);
+	}
+	&.p-divider-vertical {
+		margin-left: var(--gap-small);
+		margin-right: var(--gap);
+	}
 }
 </style>
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
deleted file mode 100644
index 028e70d750..0000000000
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-<template>
-	<Accordion multiple :active-index="[0]">
-		<AccordionTab>
-			<template #header>
-				Parameters<span class="artifact-amount">({{ numParameters }})</span>
-				<Button
-					v-if="!isAddingUncertainty"
-					label="Add uncertainty"
-					text
-					size="small"
-					@click.stop="onAddUncertainty"
-				/>
-			</template>
-
-			<!-- Adding uncertainty header -->
-			<span v-if="isAddingUncertainty">
-				<Button size="small" text label="Unselect all" @click="selectedParameters = []" />
-				Add
-				<Dropdown
-					v-model="uncertaintyType"
-					option-label="name"
-					option-value="value"
-					:options="
-						distributionTypeOptions().filter((type) => type.value !== DistributionType.Constant)
-					"
-				>
-					<template #value>
-						{{ DistributionTypeLabel[uncertaintyType].toLowerCase() }}
-					</template>
-					<template #option="{ option }">
-						{{ option.name.toLowerCase() }}
-					</template>
-				</Dropdown>
-				uncertainty with ±
-				<InputNumber
-					class="uncertainty-percentage"
-					v-model="uncertaintyPercentage"
-					suffix="%"
-					:min="0"
-					:max="100"
-				/>
-				bounds on the value of the selected constant parameters.
-				<Button text small icon="pi pi-check" @click="onUpdateDistributions" />
-				<Button text small icon="pi pi-times" @click="isAddingUncertainty = false" />
-			</span>
-
-			<!-- Stratified -->
-			<Accordion v-if="isStratified" multiple>
-				<AccordionTab
-					v-for="[key, values] in collapseParameters(props.mmt, props.mmtParams).entries()"
-					:key="key"
-				>
-					<template #header>
-						<span>{{ key }}</span>
-						<Button label="Open Matrix" text size="small" @click.stop="matrixModalId = key" />
-					</template>
-					<div class="flex">
-						<Divider layout="vertical" type="solid" />
-						<ul>
-							<li v-for="parameterId in values" :key="parameterId">
-								<div class="flex gap-4">
-									<Checkbox
-										v-if="
-											isAddingUncertainty &&
-											getParameterDistribution(modelConfiguration, parameterId).type ===
-												DistributionType.Constant
-										"
-										binary
-										:model-value="selectedParameters.includes(parameterId)"
-										@change="onSelect(parameterId)"
-									/>
-									<tera-parameter-entry
-										:model="model"
-										:model-configuration="props.modelConfiguration"
-										:parameter-id="parameterId"
-										@update-parameter="emit('update-parameters', [$event])"
-										@update-source="emit('update-source', $event)"
-									/>
-								</div>
-								<Divider type="solid" />
-							</li>
-						</ul>
-					</div>
-				</AccordionTab>
-			</Accordion>
-
-			<!-- Unstratified -->
-			<ul v-else class="flex-grow">
-				<li v-for="{ id } in getParameters(modelConfiguration)" :key="id">
-					<div class="flex gap-4">
-						<Checkbox
-							v-if="
-								isAddingUncertainty &&
-								getParameterDistribution(modelConfiguration, id).type === DistributionType.Constant
-							"
-							binary
-							:model-value="selectedParameters.includes(id)"
-							@change="onSelect(id)"
-						/>
-						<tera-parameter-entry
-							:model="model"
-							:model-configuration="modelConfiguration"
-							:parameter-id="id"
-							@update-parameter="emit('update-parameters', [$event])"
-							@update-source="emit('update-source', $event)"
-						/>
-					</div>
-					<Divider type="solid" />
-				</li>
-			</ul>
-		</AccordionTab>
-	</Accordion>
-
-	<Teleport to="body">
-		<tera-stratified-matrix-modal
-			v-if="matrixModalId && isStratified"
-			:id="matrixModalId"
-			:mmt="mmt"
-			:mmt-params="mmtParams"
-			:stratified-matrix-type="StratifiedMatrix.Parameters"
-			:open-value-config="!!matrixModalId"
-			@close-modal="matrixModalId = ''"
-			@update-cell-value="
-				emit('update-parameters', [
-					{
-						id: $event.variableName,
-						distribution: {
-							type: DistributionType.Constant,
-							parameters: { value: $event.newValue }
-						}
-					}
-				])
-			"
-		/>
-	</Teleport>
-</template>
-
-<script setup lang="ts">
-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';
-import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
-import Accordion from 'primevue/accordion';
-import AccordionTab from 'primevue/accordiontab';
-import Button from 'primevue/button';
-import Divider from 'primevue/divider';
-import {
-	DistributionType,
-	DistributionTypeLabel,
-	distributionTypeOptions
-} from '@/services/distribution';
-import InputNumber from 'primevue/inputnumber';
-import Dropdown from 'primevue/dropdown';
-import Checkbox from 'primevue/checkbox';
-import TeraParameterEntry from './tera-parameter-entry.vue';
-import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
-
-const props = defineProps<{
-	model: Model;
-	modelConfiguration: ModelConfigurationLegacy;
-	mmt: MiraModel;
-	mmtParams: MiraTemplateParams;
-}>();
-
-const emit = defineEmits(['update-parameters', 'update-source']);
-
-const isStratified = isStratifiedModel(props.mmt);
-
-const isAddingUncertainty = ref(false);
-const uncertaintyType = ref(DistributionType.Uniform);
-const uncertaintyPercentage = ref(10);
-const selectedParameters = ref<string[]>([]);
-
-const numParameters = computed(() => Object.keys(props.mmt.parameters).length);
-
-const matrixModalId = ref('');
-
-const onAddUncertainty = () => {
-	const selected = Object.keys(props.mmt.parameters).filter(
-		(paramId) =>
-			getParameterDistribution(props.modelConfiguration, paramId).type === DistributionType.Constant
-	);
-	selectedParameters.value = selected;
-	isAddingUncertainty.value = true;
-};
-
-const onSelect = (paramId: string) => {
-	if (selectedParameters.value.includes(paramId)) {
-		selectedParameters.value.splice(selectedParameters.value.indexOf(paramId), 1);
-	} else {
-		selectedParameters.value.push(paramId);
-	}
-};
-
-const onUpdateDistributions = () => {
-	const distributionParameterMappings: { id: string; distribution: ModelDistribution }[] = [];
-	if (uncertaintyType.value === DistributionType.Uniform) {
-		selectedParameters.value.forEach((paramId) => {
-			const distribution = getParameterDistribution(props.modelConfiguration, paramId);
-			if (distribution.type !== DistributionType.Constant) return;
-
-			const v = distribution.parameters.value;
-			const delta = (distribution.parameters.value * uncertaintyPercentage.value) / 100;
-
-			const distributionParameterMapping = {
-				id: paramId,
-				distribution: {
-					type: uncertaintyType.value,
-					parameters: {
-						minimum: v - delta,
-						maximum: v + delta
-					}
-				}
-			};
-			distributionParameterMappings.push(distributionParameterMapping);
-		});
-	}
-
-	emit('update-parameters', distributionParameterMappings);
-	isAddingUncertainty.value = false;
-};
-</script>
-
-<style scoped>
-ul {
-	flex-grow: 1;
-	li {
-		list-style: none;
-	}
-}
-
-:deep(.p-divider) {
-	&.p-divider-horizontal {
-		margin-top: 0;
-		margin-bottom: var(--gap);
-		color: var(--gray-300);
-	}
-	&.p-divider-vertical {
-		margin-left: var(--gap-small);
-		margin-right: var(--gap);
-	}
-}
-
-.artifact-amount {
-	font-size: var(--font-caption);
-	color: var(--text-color-subdued);
-	margin-left: 0.25rem;
-}
-:deep(.uncertainty-percentage) > input {
-	width: 4rem;
-}
-</style>
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 0e9940e959..fea6b0acc3 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
@@ -1,641 +1,253 @@
 <template>
-	<Datatable
-		:value="data ?? tableFormattedParams"
-		v-model:expanded-rows="expandedRows"
-		dataKey="id"
-		:row-class="rowClass"
-		size="small"
-		:class="{ 'hide-header': hideHeader }"
-		edit-mode="cell"
-		@cell-edit-complete="conceptSearchTerm = { curie: '', name: '' }"
-	>
-		<!-- Row expander, ID and Name columns -->
-		<Column expander class="w-3rem" />
-
-		<!-- Symbol -->
-		<Column header="Symbol" class="w-2">
-			<template #body="slotProps">
-				<span class="truncate-text latex-font">
-					{{ slotProps.data.id }}
-				</span>
-			</template>
-		</Column>
-
-		<!-- Name -->
-		<Column header="Name">
-			<template #body="{ data }">
-				<InputText
-					v-model.lazy="data.name"
-					:disabled="configView || readonly || data.type === ParamType.MATRIX"
-					@update:model-value="updateParamValue(data.value, 'name', $event)"
-				/>
-			</template>
-		</Column>
-
-		<Column header="Description" class="w-2">
-			<template #body="{ data }">
-				<InputText
-					v-model.lazy="data.description"
-					:disabled="configView || readonly || data.type === ParamType.MATRIX"
-					@update:model-value="updateParamValue(data.value, 'description', $event)"
-				/>
-			</template>
-		</Column>
-
-		<Column header="Unit" class="w-1">
-			<template #body="slotProps">
-				<InputText
-					v-if="slotProps.data.type !== ParamType.MATRIX"
-					class="w-full"
-					v-model.lazy="slotProps.data.unit"
-					:disabled="readonly"
-					@update:model-value="
-						updateParamValue(slotProps.data.value, 'unit', {
-							...slotProps.data.value.unit,
-							expression: $event
-						})
-					"
-				/>
-				<template v-else>--</template>
-			</template>
-		</Column>
-
-		<!-- Value type: Matrix or a Contant -->
-		<Column field="type" header="Constant" class="pl-2 pr-6 w-2">
-			<template #body="slotProps">
+	<Accordion multiple :active-index="[0]">
+		<AccordionTab>
+			<template #header>
+				Parameters<span class="artifact-amount">({{ numParameters }})</span>
 				<Button
+					v-if="!isAddingUncertainty"
+					label="Add uncertainty"
 					text
-					v-if="slotProps.data.type === ParamType.MATRIX"
-					icon="pi pi-table"
-					label="Matrix"
-					@click="openMatrixModal(slotProps.data)"
-					class="p-0"
-				/>
-				<tera-input-number
-					v-else
-					class="constant-number"
-					v-model.lazy="slotProps.data.value.value"
-					:min-fraction-digits="1"
-					:max-fraction-digits="10"
-					:disabled="readonly"
-					@update:model-value="emit('update-value', [slotProps.data.value])"
+					size="small"
+					@click.stop="onAddUncertainty"
 				/>
 			</template>
-		</Column>
 
-		<!-- Value: the thing we show depends on the type of number -->
-		<Column field="value" header="Distribution" class="w-4 pl-2 pr-2">
-			<template #body="slotProps">
-				<!-- Matrix -->
-				<span
-					v-if="slotProps.data.type === ParamType.MATRIX"
-					@click="openMatrixModal(slotProps.data)"
-					class="cursor-pointer secondary-text text-sm"
-					>Open matrix</span
+			<!-- Adding uncertainty header -->
+			<span v-if="isAddingUncertainty">
+				<Button size="small" text label="Unselect all" @click="selectedParameters = []" />
+				Add
+				<Dropdown
+					v-model="uncertaintyType"
+					option-label="name"
+					option-value="value"
+					:options="
+						distributionTypeOptions().filter((type) => type.value !== DistributionType.Constant)
+					"
 				>
-				<!-- Distribution -->
-				<div v-else class="distribution-container">
-					<label>Min</label>
-					<tera-input-number
-						class="distribution-item min-value"
-						v-model.lazy="slotProps.data.value.distribution.parameters.minimum"
-						:min-fraction-digits="1"
-						:max-fraction-digits="10"
-						:disabled="readonly"
-						@update:model-value="emit('update-value', [slotProps.data.value])"
-					/>
-					<label>Max</label>
-					<tera-input-number
-						class="distribution-item max-value"
-						v-model.lazy="slotProps.data.value.distribution.parameters.maximum"
-						:min-fraction-digits="1"
-						:max-fraction-digits="10"
-						:disabled="readonly"
-						@update:model-value="emit('update-value', [slotProps.data.value])"
-					/>
-				</div>
-			</template>
-		</Column>
-
-		<!-- Suggested Configurations Button -->
-		<Column v-if="configView && !readonly">
-			<template #body="{ data }">
-				<Button
-					v-if="data.type !== ParamType.MATRIX"
-					text
-					:label="`Suggested Configurations (${countSuggestions(data.id)})`"
-					@click="openSuggestedValuesModal(data.id)"
+					<template #value>
+						{{ DistributionTypeLabel[uncertaintyType].toLowerCase() }}
+					</template>
+					<template #option="{ option }">
+						{{ option.name.toLowerCase() }}
+					</template>
+				</Dropdown>
+				uncertainty with ±
+				<InputNumber
+					class="uncertainty-percentage"
+					v-model="uncertaintyPercentage"
+					suffix="%"
+					:min="0"
+					:max="100"
 				/>
-			</template>
-		</Column>
+				bounds on the value of the selected constant parameters.
+				<Button text small icon="pi pi-check" @click="onUpdateDistributions" />
+				<Button text small icon="pi pi-times" @click="isAddingUncertainty = false" />
+			</span>
+
+			<!-- Stratified -->
+			<Accordion v-if="isStratified" multiple>
+				<AccordionTab
+					v-for="[key, values] in collapseParameters(props.mmt, props.mmtParams).entries()"
+					:key="key"
+				>
+					<template #header>
+						<span>{{ key }}</span>
+						<Button label="Open Matrix" text size="small" @click.stop="matrixModalId = key" />
+					</template>
+					<div class="flex">
+						<Divider layout="vertical" type="solid" />
+						<ul>
+							<li v-for="parameterId in values" :key="parameterId">
+								<div class="flex gap-4">
+									<Checkbox
+										v-if="
+											isAddingUncertainty &&
+											getParameterDistribution(modelConfiguration, parameterId).type ===
+												DistributionType.Constant
+										"
+										binary
+										:model-value="selectedParameters.includes(parameterId)"
+										@change="onSelect(parameterId)"
+									/>
+									<tera-parameter-entry
+										:model="model"
+										:model-configuration="props.modelConfiguration"
+										:parameter-id="parameterId"
+										@update-parameter="emit('update-parameters', [$event])"
+										@update-source="emit('update-source', $event)"
+									/>
+								</div>
+								<Divider type="solid" />
+							</li>
+						</ul>
+					</div>
+				</AccordionTab>
+			</Accordion>
+
+			<!-- Unstratified -->
+			<ul v-else class="flex-grow">
+				<li v-for="{ id } in getParameters(modelConfiguration)" :key="id">
+					<div class="flex gap-4">
+						<Checkbox
+							v-if="
+								isAddingUncertainty &&
+								getParameterDistribution(modelConfiguration, id).type === DistributionType.Constant
+							"
+							binary
+							:model-value="selectedParameters.includes(id)"
+							@change="onSelect(id)"
+						/>
+						<tera-parameter-entry
+							:model="model"
+							:model-configuration="modelConfiguration"
+							:parameter-id="id"
+							@update-parameter="emit('update-parameters', [$event])"
+							@update-source="emit('update-source', $event)"
+						/>
+					</div>
+					<Divider type="solid" />
+				</li>
+			</ul>
+		</AccordionTab>
+	</Accordion>
 
-		<!-- Hiding for now until functionality is available
-		<Column field="visibility" header="Visibility" style="width: 10%">
-			<template #body="slotProps">
-				<InputSwitch v-model="slotProps.data.visibility" @click.stop />
-			</template>
-		</Column> -->
-		<template #expansion="slotProps">
-			<tera-parameter-table
-				hide-header
-				v-if="slotProps.data.type === ParamType.MATRIX"
-				:model="model"
-				:model-configurations="modelConfigurations"
-				:mmt="mmt"
-				:mmt-params="mmtParams"
-				:data="slotProps.data.tableFormattedMatrix"
-				:readonly="readonly"
-				:config-view="configView"
-				@update-value="(val: ModelParameter) => emit('update-value', val)"
-				@update-model="(model: Model) => emit('update-model', model)"
-			/>
-		</template>
-	</Datatable>
 	<Teleport to="body">
 		<tera-stratified-matrix-modal
-			v-if="matrixModalContext.isOpen && isStratified"
-			:id="matrixModalContext.matrixId"
+			v-if="matrixModalId && isStratified"
+			:id="matrixModalId"
 			:mmt="mmt"
 			:mmt-params="mmtParams"
 			:stratified-matrix-type="StratifiedMatrix.Parameters"
-			:open-value-config="matrixModalContext.isOpen"
-			@close-modal="matrixModalContext.isOpen = false"
-			@update-cell-value="(configToUpdate: any) => updateCellValue(configToUpdate)"
+			@close-modal="matrixModalId = ''"
+			@update-cell-value="
+				emit('update-parameters', [
+					{
+						id: $event.variableName,
+						distribution: {
+							type: DistributionType.Constant,
+							parameters: { value: $event.newValue }
+						}
+					}
+				])
+			"
 		/>
-
-		<tera-modal
-			v-if="suggestedValuesModalContext.isOpen"
-			@modal-mask-clicked="onCloseSuggestedValuesModal"
-			:width="1000"
-		>
-			<template #header
-				><h5>Suggested configurations for {{ suggestedValuesModalContext.id }}</h5></template
-			>
-			<Datatable
-				:value="suggestedValues"
-				dataKey="index"
-				v-model:selection="selectedValue"
-				tableStyle="min-width: 80rem"
-			>
-				<Column selectionMode="single" class="w-3rem"></Column>
-				<Column header="Symbol">
-					<template #body="{ data }">
-						<span class="truncate-text">
-							{{ data.parameter.id }}
-						</span>
-					</template>
-				</Column>
-				<Column header="Name">
-					<template #body="{ data }">
-						<span class="truncate-text">
-							{{ data.parameter.name }}
-						</span>
-					</template>
-				</Column>
-				<Column header="Configuration">
-					<template #body="{ data }">
-						{{ data.configuration?.name }}
-					</template>
-				</Column>
-				<Column header="Constant">
-					<template #body="{ data }">
-						{{ data.parameter.value }}
-					</template>
-				</Column>
-				<Column header="Distribution">
-					<template #body="{ data }">
-						<div class="distribution-container">
-							<span>Min: {{ data.parameter.distribution?.parameters.minimum }}</span>
-							<span>Max: {{ data.parameter.distribution?.parameters.maximum }}</span>
-						</div>
-					</template>
-				</Column>
-				<Column header="Source">
-					<template #body="{ data }">
-						<span>{{
-							data.configuration.configuration.metadata?.parameters?.[data.parameter.id]?.source ??
-							data.configuration.configuration.metadata?.source?.join(', ')
-						}}</span>
-					</template>
-				</Column>
-			</Datatable>
-			<template #footer>
-				<Button
-					label="Apply selected configuration"
-					:disabled="isEmpty(selectedValue)"
-					@click="applySelectedValue"
-				/>
-				<Button outlined label="Close" @click="onCloseSuggestedValuesModal" />
-			</template>
-		</tera-modal>
 	</Teleport>
 </template>
 
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import { cloneDeep, isEmpty } from 'lodash';
-import Button from 'primevue/button';
-import type { Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
-import InputText from 'primevue/inputtext';
-import Datatable from 'primevue/datatable';
-import Column from 'primevue/column';
+import { Model, ModelConfigurationLegacy, ModelDistribution } from '@/types/Types';
+import { getParameterDistribution, getParameters } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
-import TeraStratifiedMatrixModal from '@/components/model/petrinet/model-configurations/tera-stratified-matrix-modal.vue';
-import { AMRSchemaNames, ModelConfigTableData, ParamType } from '@/types/common';
-
-import { getModelType } from '@/services/model';
-import { matrixEffect } from '@/utils/easter-eggs';
+import { computed, ref } from 'vue';
+import { collapseParameters, isStratifiedModel } from '@/model-representation/mira/mira';
 import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
-import { isStratifiedModel, collapseParameters } from '@/model-representation/mira/mira';
+import Accordion from 'primevue/accordion';
+import AccordionTab from 'primevue/accordiontab';
+import Button from 'primevue/button';
+import Divider from 'primevue/divider';
 import {
-	updateVariable,
-	getParameterMetadata,
-	getParameters
-} from '@/model-representation/service';
-import TeraModal from '@/components/widgets/tera-modal.vue';
-import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
+	DistributionType,
+	DistributionTypeLabel,
+	distributionTypeOptions
+} from '@/services/distribution';
+import InputNumber from 'primevue/inputnumber';
+import Dropdown from 'primevue/dropdown';
+import Checkbox from 'primevue/checkbox';
+import TeraParameterEntry from './tera-parameter-entry.vue';
+import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-matrix-modal.vue';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfigurationLegacy[];
+	modelConfiguration: 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
-	hideHeader?: boolean;
-	readonly?: boolean;
-	configView?: boolean; // if the table is in the model config view we have limited functionality
 }>();
 
-const emit = defineEmits(['update-value', 'update-model']);
+const emit = defineEmits(['update-parameters', 'update-source']);
 
-const isStratified = computed(() => isStratifiedModel(props.mmt));
+const isStratified = isStratifiedModel(props.mmt);
 
-interface SuggestedValue {
-	parameter: ModelParameter;
-	configuration: ModelConfigurationLegacy;
-	index: number;
-}
-const selectedValue = ref<SuggestedValue | null>(null);
-const suggestedValues = computed(() => {
-	const matchingParameters: SuggestedValue[] = [];
-	props.modelConfigurations?.forEach((configuration, i) => {
-		getParameters(configuration.configuration).forEach((parameter) => {
-			if (parameter.id === suggestedValuesModalContext.value.id) {
-				matchingParameters.push({
-					parameter,
-					configuration,
-					index: i
-				});
-			}
-		});
-	});
+const isAddingUncertainty = ref(false);
+const uncertaintyType = ref(DistributionType.Uniform);
+const uncertaintyPercentage = ref(10);
+const selectedParameters = ref<string[]>([]);
 
-	return matchingParameters;
-});
-
-const matrixModalContext = ref({
-	isOpen: false,
-	matrixId: ''
-});
-
-const suggestedValuesModalContext = ref({
-	isOpen: false,
-	id: ''
-});
-const parameters = computed<Map<string, string[]>>(() => {
-	if (isStratified.value) {
-		const collapsedParams = collapseParameters(props.mmt, props.mmtParams);
-		return collapsedParams;
-	}
+const numParameters = computed(() => Object.keys(props.mmt.parameters).length);
 
-	// Non-stratified logic
-	const result = new Map<string, string[]>();
-	Object.keys(props.mmt.parameters).forEach((key) => {
-		const p = props.mmt.parameters[key];
-		result.set(p.name, [p.name]);
-	});
-	return result;
-});
+const matrixModalId = ref('');
 
-const tableFormattedParams = ref<ModelConfigTableData[]>([]);
-
-// FIXME: This method doee not really work in this context, the different types
-// of CONSTANT/TIME_SERIES/DISTRIBUTION are not mutually exclusive, a parameter
-// can have one or more types
-const getParamType = (param: ModelParameter | undefined) => {
-	let type = ParamType.CONSTANT;
-	if (!param) return type;
+const onAddUncertainty = () => {
+	const selected = Object.keys(props.mmt.parameters).filter(
+		(paramId) =>
+			getParameterDistribution(props.modelConfiguration, paramId).type === DistributionType.Constant
+	);
+	selectedParameters.value = selected;
+	isAddingUncertainty.value = true;
+};
 
-	if (param?.distribution) {
-		type = ParamType.DISTRIBUTION;
+const onSelect = (paramId: string) => {
+	if (selectedParameters.value.includes(paramId)) {
+		selectedParameters.value.splice(selectedParameters.value.indexOf(paramId), 1);
+	} else {
+		selectedParameters.value.push(paramId);
 	}
-	return type;
 };
 
-const buildParameterTable = () => {
-	const model = props.model;
-	const formattedParams: ModelConfigTableData[] = [];
+const onUpdateDistributions = () => {
+	const distributionParameterMappings: { id: string; distribution: ModelDistribution }[] = [];
+	if (uncertaintyType.value === DistributionType.Uniform) {
+		selectedParameters.value.forEach((paramId) => {
+			const distribution = getParameterDistribution(props.modelConfiguration, paramId);
+			if (distribution.type !== DistributionType.Constant) return;
 
-	if (isStratified.value) {
-		parameters.value.forEach((vals, init) => {
-			const tableFormattedMatrix: ModelConfigTableData[] = vals.map((v) => {
-				const param = getParameters(model).find((i) => i.id === v);
-				const paramType = getParamType(param);
-				const parametersMetadata = getParameterMetadata(props.model, param!.id);
-				const sourceValue = parametersMetadata?.source;
-				// If the parameter does not have a distribution, add a default distribution for editing purposes
-				if (param && !param.distribution) {
-					const lb = '';
-					const ub = '';
-					param.distribution = {
-						type: 'StandardUniform1',
-						parameters: {
-							minimum: lb,
-							maximum: ub
-						}
-					};
-				}
-				return {
-					id: v,
-					name: param?.name ?? '',
-					type: paramType,
-					description: param?.description ?? '',
-					concept: param?.grounding ?? { identifiers: {} },
-					units: param?.units?.expression ?? '',
-					value: param,
-					source: sourceValue,
-					visibility: false
-				};
-			});
-			formattedParams.push({
-				id: init,
-				name: init,
-				description: '',
-				concept: { identifiers: {} },
-				type: ParamType.MATRIX,
-				value: 'matrix',
-				source: '',
-				visibility: false,
-				tableFormattedMatrix
-			});
-		});
-	} else {
-		parameters.value.forEach((vals, init) => {
-			const param = getParameters(model).find((i) => i.id === vals[0]);
-			if (!param) return;
-			const paramType = getParamType(param);
+			const v = distribution.parameters.value;
+			const delta = (distribution.parameters.value * uncertaintyPercentage.value) / 100;
 
-			const parametersMetadata = getParameterMetadata(props.model, param.id);
-			const sourceValue = parametersMetadata?.source;
-			if (!param.distribution) {
-				const lb = '';
-				const ub = '';
-				param.distribution = {
-					type: 'StandardUniform1',
+			const distributionParameterMapping = {
+				id: paramId,
+				distribution: {
+					type: uncertaintyType.value,
 					parameters: {
-						minimum: lb,
-						maximum: ub
+						minimum: v - delta,
+						maximum: v + delta
 					}
-				};
-			}
-			formattedParams.push({
-				id: init,
-				name: param.name ?? '',
-				type: paramType,
-				description: param.description ?? '',
-				concept: param.grounding ?? { identifiers: {} },
-				unit: param.units?.expression,
-				value: param,
-				source: sourceValue,
-				visibility: false
-			});
-		});
-
-		// Stockflow has auxiliaries
-		const auxiliaries = model.model?.auxiliaries ?? [];
-		auxiliaries.forEach((aux) => {
-			const paramType = getParamType(aux);
-			const parametersMetadata = model.metadata?.parameters?.[aux.id];
-			const sourceValue = parametersMetadata?.source;
-			formattedParams.push({
-				id: aux.id,
-				name: aux.name,
-				type: paramType,
-				description: aux.description,
-				concept: aux.grounding,
-				unit: aux.units?.expression,
-				value: aux,
-				source: sourceValue,
-				visibility: false
-			});
+				}
+			};
+			distributionParameterMappings.push(distributionParameterMapping);
 		});
 	}
-	tableFormattedParams.value = formattedParams;
-};
-
-const conceptSearchTerm = ref({
-	curie: '',
-	name: ''
-});
-
-const modelType = computed(() => getModelType(props.model));
-
-// const addPlusMinus = ref(10);
 
-const expandedRows = ref([]);
-
-const openMatrixModal = (datum: ModelConfigTableData) => {
-	// Matrix effect easter egg (shows matrix effect 1 in 10 times a person clicks the Matrix button)
-	matrixEffect();
-
-	const id = datum.id;
-	if (!datum.tableFormattedMatrix) return;
-	matrixModalContext.value = {
-		isOpen: true,
-		matrixId: id
-	};
-};
-
-const rowClass = (rowData) => (rowData.type === ParamType.MATRIX ? '' : 'no-expander');
-
-const updateCellValue = (v: any) => {
-	const clone = cloneDeep(props.model);
-	updateVariable(clone, 'parameters', v.variableName, v.newValue, v.mathml);
-	emit('update-model', clone);
-};
-
-const updateParamValue = (param: ModelParameter, key: string, value: any) => {
-	const clonedParam = cloneDeep(param);
-	clonedParam[key] = value;
-	emit('update-value', [clonedParam]);
+	emit('update-parameters', distributionParameterMappings);
+	isAddingUncertainty.value = false;
 };
-
-const openSuggestedValuesModal = (id: string) => {
-	suggestedValuesModalContext.value.isOpen = true;
-	suggestedValuesModalContext.value.id = id;
-};
-
-const onCloseSuggestedValuesModal = () => {
-	suggestedValuesModalContext.value.isOpen = false;
-	suggestedValuesModalContext.value.id = '';
-	selectedValue.value = null;
-};
-
-const applySelectedValue = () => {
-	if (!selectedValue.value) return;
-
-	const clonedModel = cloneDeep(props.model);
-	const metadata =
-		selectedValue.value.configuration.configuration.metadata?.parameters?.[
-			selectedValue.value.parameter.id
-		] ?? {};
-
-	clonedModel.metadata ??= {};
-	clonedModel.metadata.parameters ??= {};
-	clonedModel.metadata.parameters[selectedValue.value.parameter.id] = metadata;
-
-	// default source to use confirguration's source if there is no source
-	clonedModel.metadata.parameters[selectedValue.value.parameter.id].source =
-		metadata?.source ??
-		selectedValue.value.configuration.configuration.metadata?.source?.join(', ');
-
-	let parameterIdx;
-	if (modelType.value === AMRSchemaNames.REGNET) {
-		parameterIdx = clonedModel.model.parameters.findIndex(
-			(p) => p.id === selectedValue.value?.parameter.id
-		);
-		clonedModel.model.parameters[parameterIdx] = selectedValue.value.parameter;
-	} else {
-		parameterIdx = clonedModel.semantics?.ode.parameters?.findIndex(
-			(p) => p.id === selectedValue.value?.parameter.id
-		);
-		if (clonedModel.semantics?.ode.parameters)
-			clonedModel.semantics.ode.parameters[parameterIdx] = selectedValue.value.parameter;
-	}
-
-	emit('update-model', clonedModel);
-	onCloseSuggestedValuesModal();
-};
-
-const countSuggestions = (id): number =>
-	props.modelConfigurations?.filter((configuration) =>
-		getParameters(configuration.configuration).find((p) => p.id === id)
-	).length ?? 0;
-
-watch(
-	() => [parameters.value, props.model],
-	(val) => {
-		if (!val) return;
-		buildParameterTable();
-	},
-	{ deep: true, immediate: true }
-);
 </script>
 
 <style scoped>
-.truncate-text {
-	display: flex;
-	width: 10rem;
-}
-
-.p-datatable.p-datatable-sm :deep(.p-datatable-tbody > tr > td) {
-	padding: 0;
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander > td .p-row-toggler) {
-	visibility: hidden;
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander) {
-	background: var(--surface-0);
-}
-
-.p-datatable :deep(.p-datatable-tbody > tr.no-expander > td) {
-	padding: 0;
-}
-
-.hide-header :deep(.p-datatable-thead) {
-	display: none;
-}
-
-.distribution-container {
-	display: flex;
-	align-items: center;
-	gap: var(--gap-small);
-}
-
-.distribution-item {
-	width: 100%;
-	font-feature-settings: 'tnum';
-	font-size: var(--font-caption);
-	text-align: right;
-}
-
-.constant-number {
-	font-feature-settings: 'tnum';
-	font-size: var(--font-caption);
-	text-align: right;
-}
-
-.add-plus-minus {
-	width: 3rem;
-	margin-left: var(--gap-xsmall);
+ul {
+	flex-grow: 1;
+	li {
+		list-style: none;
+	}
 }
 
-.tabular-numbers {
-	font-feature-settings: 'tnum';
-	font-size: var(--font-caption);
-	text-align: right;
+:deep(.p-divider) {
+	&.p-divider-horizontal {
+		margin-top: 0;
+		margin-bottom: var(--gap);
+		color: var(--gray-300);
+	}
+	&.p-divider-vertical {
+		margin-left: var(--gap-small);
+		margin-right: var(--gap);
+	}
 }
 
-/* FIXMEL Reapply these later */
-.min-value {
-	position: relative;
-}
-.min-value::before {
-	content: 'Min';
-	position: relative;
-	top: 11px;
-	left: var(--gap-small);
-	color: var(--text-color-subdued);
-	font-size: var(--font-caption);
-	width: 0;
-}
-.max-value::before {
-	content: 'Max';
-	position: relative;
-	top: 11px;
-	left: var(--gap-small);
-	color: var(--text-color-subdued);
+.artifact-amount {
 	font-size: var(--font-caption);
-	width: 0;
-}
-
-.custom-icon-distribution {
-	background-image: url('@assets/svg/icons/distribution.svg');
-	background-size: contain;
-	background-repeat: no-repeat;
-	display: inline-block;
-	width: 1rem;
-	height: 1rem;
-}
-.custom-icon-expression {
-	background-image: url('@assets/svg/icons/expression.svg');
-	background-size: contain;
-	background-repeat: no-repeat;
-	display: inline-block;
-	width: 1rem;
-	height: 1rem;
-}
-.invalid-message {
-	color: var(--text-color-danger);
-}
-
-.secondary-text {
 	color: var(--text-color-subdued);
+	margin-left: 0.25rem;
 }
-
-.value-type-dropdown {
-	min-width: 10rem;
+:deep(.uncertainty-percentage) > input {
+	width: 4rem;
 }
 </style>
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
index 85d25b6175..2476af0ca4 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
@@ -4,9 +4,11 @@
 			<template #header>
 				Initial variables<span class="artifact-amount">({{ initialsLength }})</span>
 			</template>
-			<tera-initials-metadata
+			<tera-states-metadata
+				v-if="!isEmpty(mmt.initials)"
 				:model="model"
-				@update-initial-metadata="emit('update-initial-metadata', $event)"
+				:mmt="mmt"
+				@update-state="emit('update-state', $event)"
 			/>
 		</AccordionTab>
 		<AccordionTab>
@@ -14,7 +16,10 @@
 				Parameters<span class="artifact-amount">({{ parameters?.length }})</span>
 			</template>
 			<tera-parameters-metadata
+				v-if="!isEmpty(mmt.parameters)"
 				:model="model"
+				:mmt="mmt"
+				:mmt-params="mmtParams"
 				@update-parameter="emit('update-parameter', $event)"
 			/>
 		</AccordionTab>
@@ -123,7 +128,7 @@ import Column from 'primevue/column';
 import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
 import { emptyMiraModel } from '@/model-representation/mira/mira';
 import { getMMT } from '@/services/model';
-import TeraInitialsMetadata from '@/components/model/tera-initials-metadata.vue';
+import TeraStatesMetadata from '@/components/model/tera-states-metadata.vue';
 import TeraParametersMetadata from '@/components/model//tera-parameters-metadata.vue';
 import TeraOtherConceptsTable from './tera-other-concepts-table.vue';
 
@@ -132,7 +137,7 @@ const props = defineProps<{
 	readonly?: boolean;
 }>();
 
-const emit = defineEmits(['update-model', 'update-initial-metadata', 'update-parameter']);
+const emit = defineEmits(['update-model', 'update-state', 'update-parameter']);
 
 const mmt = ref<MiraModel>(emptyMiraModel());
 const mmtParams = ref<MiraTemplateParams>({});
diff --git a/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue b/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
index c5b86305ed..c9ebc442e8 100644
--- a/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
+++ b/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
@@ -64,7 +64,10 @@
 		</AccordionTab>
 		<AccordionTab header="Parameters">
 			<tera-parameters-metadata
+				v-if="!isEmpty(mmt.parameters)"
 				:model="model"
+				:mmt="mmt"
+				:mmt-params="mmtParams"
 				@update-parameter="emit('update-parameter', $event)"
 			/>
 		</AccordionTab>
diff --git a/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue b/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
index 6a91ac4037..f203fe28a4 100644
--- a/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
+++ b/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
@@ -4,9 +4,11 @@
 			<template #header>
 				Initial variables<span class="artifact-amount">({{ initialsLength }})</span>
 			</template>
-			<tera-initials-metadata
+			<tera-states-metadata
+				v-if="!isEmpty(mmt.initials)"
 				:model="model"
-				@update-initial-metadata="emit('update-initial-metadata', $event)"
+				:mmt="mmt"
+				@update-state="emit('update-state', $event)"
 			/>
 		</AccordionTab>
 		<AccordionTab>
@@ -14,7 +16,10 @@
 				Parameters<span class="artifact-amount">({{ parametersLength }})</span>
 			</template>
 			<tera-parameters-metadata
+				v-if="!isEmpty(mmt.parameters)"
 				:model="model"
+				:mmt="mmt"
+				:mmt-params="mmtParams"
 				@update-parameter="emit('update-parameter', $event)"
 			/>
 		</AccordionTab>
@@ -142,15 +147,15 @@ import Column from 'primevue/column';
 import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
 import { emptyMiraModel } from '@/model-representation/mira/mira';
 import { getMMT } from '@/services/model';
+import TeraStatesMetadata from '@/components/model/tera-states-metadata.vue';
 import TeraParametersMetadata from '../tera-parameters-metadata.vue';
-import TeraInitialsMetadata from '../tera-initials-metadata.vue';
 
 const props = defineProps<{
 	model: Model;
 	readonly?: boolean;
 }>();
 
-const emit = defineEmits(['update-initial-metadata', 'update-parameter']);
+const emit = defineEmits(['update-state', 'update-parameter']);
 
 const mmt = ref<MiraModel>(emptyMiraModel());
 const mmtParams = ref<MiraTemplateParams>({});
diff --git a/packages/client/hmi-client/src/components/model/tera-initial-metadata-entry.vue b/packages/client/hmi-client/src/components/model/tera-initial-metadata-entry.vue
deleted file mode 100644
index 4a160c3948..0000000000
--- a/packages/client/hmi-client/src/components/model/tera-initial-metadata-entry.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-	<section>
-		<h6>{{ target }}</h6>
-		<tera-input
-			label="Name"
-			:model-value="getInitialName(model, target)"
-			@update:model-value="$emit('update-initial-metadata', { key: 'name', value: $event })"
-		/>
-		<tera-input
-			label="Description"
-			:model-value="getInitialDescription(model, target)"
-			@update:model-value="
-				$emit('update-initial-metadata', {
-					key: 'description',
-					value: $event
-				})
-			"
-		/>
-		<tera-input
-			label="Unit"
-			:model-value="getInitialUnits(model, target)"
-			@update:model-value="$emit('update-initial-metadata', { key: 'units', value: $event })"
-		/>
-		<!--TODO: Add support for editing concepts--->
-		<tera-input label="Concept" :model-value="getInitialConcept(model, target)" disabled />
-	</section>
-</template>
-
-<script setup lang="ts">
-import { Model } from '@/types/Types';
-import {
-	getInitialName,
-	getInitialDescription,
-	getInitialUnits,
-	getInitialConcept
-} from '@/model-representation/service';
-import TeraInput from '@/components/widgets/tera-input.vue';
-
-defineProps<{
-	model: Model;
-	target: string;
-}>();
-</script>
-
-<style scoped>
-section {
-	display: grid;
-	grid-template-areas:
-		'symbol name description description'
-		'unit		unit concept .';
-	grid-template-columns: max-content 30% 30% auto;
-	gap: var(--gap-small);
-	align-items: center;
-}
-
-h6 {
-	grid-area: symbol;
-}
-
-:deep([label='Name']) {
-	grid-area: name;
-}
-
-:deep([label='Description']) {
-	grid-area: description;
-}
-
-:deep([label='Unit']) {
-	grid-area: unit;
-}
-
-:deep([label='Concept']) {
-	grid-area: concept;
-}
-</style>
diff --git a/packages/client/hmi-client/src/components/model/tera-initials-metadata.vue b/packages/client/hmi-client/src/components/model/tera-initials-metadata.vue
deleted file mode 100644
index 326da1808e..0000000000
--- a/packages/client/hmi-client/src/components/model/tera-initials-metadata.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-	<ul>
-		<li v-for="{ target } in initials" :key="target">
-			<tera-initial-metadata-entry
-				:model="model"
-				:target="target"
-				@update-initial-metadata="$emit('update-initial-metadata', { target, ...$event })"
-			/>
-		</li>
-	</ul>
-</template>
-
-<script setup lang="ts">
-import { Model } from '@/types/Types';
-import { getInitials } from '@/model-representation/service';
-import TeraInitialMetadataEntry from '@/components/model/tera-initial-metadata-entry.vue';
-
-const props = defineProps<{
-	model: Model;
-}>();
-
-defineEmits(['update-initial-metadata']);
-
-const initials = getInitials(props.model);
-</script>
-
-<style scoped>
-li {
-	padding: var(--gap-small) 0;
-	border-bottom: 1px solid var(--surface-border);
-}
-</style>
diff --git a/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue b/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
index 97cbe484b9..b2b3556c16 100644
--- a/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
+++ b/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
@@ -4,7 +4,7 @@
 		:model="transientModel"
 		:readonly="readonly"
 		@update-model="$emit('update-model', $event)"
-		@update-initial-metadata="onUpdateInitialMetadata"
+		@update-state="onUpdateState"
 		@update-parameter="onUpdateParameter"
 	/>
 </template>
@@ -18,7 +18,12 @@ import TeraRegnetTables from '@/components/model/regnet/tera-regnet-tables.vue';
 import TeraStockflowTables from '@/components/model/stockflow/tera-stockflow-tables.vue';
 import { AMRSchemaNames } from '@/types/common';
 import { getModelType } from '@/services/model';
-import { updateInitialMetadata, updateParameter } from '@/model-representation/service';
+import {
+	updateState,
+	updateInitialMetadata,
+	updateParameter,
+	updateParameterMetadata
+} from '@/model-representation/service';
 
 const props = defineProps<{
 	model: Model;
@@ -44,14 +49,22 @@ const tables = computed(() => {
 	}
 });
 
-function onUpdateInitialMetadata(event: any) {
-	const { target, key, value } = event;
-	updateInitialMetadata(transientModel.value, target, key, value);
+function onUpdateState(event: any) {
+	const { id, key, value, isMetadata } = event;
+	if (isMetadata) {
+		updateInitialMetadata(transientModel.value, id, key, value); // For now we only have metadata for initials so just save it there
+	} else {
+		updateState(transientModel.value, id, key, value);
+	}
 }
 
 function onUpdateParameter(event: any) {
-	const { parameterId, key, value } = event;
-	updateParameter(transientModel.value, parameterId, key, value);
+	const { parameterId, key, value, isMetadata } = event;
+	if (isMetadata) {
+		updateParameterMetadata(transientModel.value, parameterId, key, value);
+	} else {
+		updateParameter(transientModel.value, parameterId, key, value);
+	}
 }
 
 // Apply changes to the model when the component unmounts or the user navigates away
diff --git a/packages/client/hmi-client/src/components/model/tera-parameter-metadata-entry.vue b/packages/client/hmi-client/src/components/model/tera-parameter-metadata-entry.vue
index 9ba4e51f73..99c2d87b12 100644
--- a/packages/client/hmi-client/src/components/model/tera-parameter-metadata-entry.vue
+++ b/packages/client/hmi-client/src/components/model/tera-parameter-metadata-entry.vue
@@ -1,5 +1,5 @@
 <template>
-	<section>
+	<section :class="{ 'has-toggle': isBase, 'no-second-row': isStratified }">
 		<h6>{{ id }}</h6>
 		<tera-input
 			label="Name"
@@ -11,24 +11,35 @@
 			:model-value="description ?? ''"
 			@update:model-value="$emit('update-parameter', { key: 'description', value: $event })"
 		/>
-		<tera-input
-			label="Unit"
-			:model-value="units?.expression ?? ''"
-			@update:model-value="$emit('update-parameter', { key: 'units', value: $event })"
-		/>
-		<!--TODO: Add support for editing concepts-->
-		<tera-input
-			label="Concept"
-			disabled
-			:model-value="
-				grounding?.identifiers
-					? getNameOfCurieCached(
-							new Map<string, string>(),
-							getCurieFromGroundingIdentifier(grounding.identifiers)
-						)
-					: ''
-			"
-		/>
+		<template v-if="!isStratified">
+			<Button
+				class="toggle"
+				v-if="isBase"
+				:icon="showStratifiedVariables ? 'pi pi-chevron-down' : 'pi pi-chevron-right'"
+				text
+				rounded
+				@click="$emit('toggle-stratified-variables')"
+			/>
+			<tera-input
+				label="Unit"
+				:model-value="units?.expression ?? ''"
+				@update:model-value="$emit('update-parameter', { key: 'units', value: $event })"
+			/>
+			<!--TODO: Add support for editing concepts-->
+			<tera-input
+				label="Concept"
+				disabled
+				:model-value="
+					grounding?.identifiers
+						? getNameOfCurieCached(
+								new Map<string, string>(),
+								getCurieFromGroundingIdentifier(grounding.identifiers)
+							)
+						: ''
+				"
+			/>
+			<Button v-if="isBase" size="small" label="Open matrix" text @click="$emit('open-matrix')" />
+		</template>
 	</section>
 </template>
 
@@ -36,12 +47,16 @@
 import type { ModelParameter } from '@/types/Types';
 import TeraInput from '@/components/widgets/tera-input.vue';
 import { getCurieFromGroundingIdentifier, getNameOfCurieCached } from '@/services/concept';
+import Button from 'primevue/button';
 
 const props = defineProps<{
 	parameter: ModelParameter;
+	isBase?: boolean;
+	isStratified?: boolean;
+	showStratifiedVariables?: boolean;
 }>();
 
-defineEmits(['update-parameter']);
+defineEmits(['update-parameter', 'toggle-stratified-variables', 'open-matrix']);
 
 const { id, name, description, grounding, units } = props.parameter;
 </script>
@@ -51,14 +66,35 @@ section {
 	display: grid;
 	grid-template-areas:
 		'symbol name description description'
-		'unit		unit concept .';
+		'unit	unit concept .';
 	grid-template-columns: max-content 30% 30% auto;
 	gap: var(--gap-small);
 	align-items: center;
 }
 
+section.has-toggle {
+	grid-template-areas:
+		'symbol name description description'
+		'toggle	unit concept open-matrix';
+	grid-template-columns: max-content 30% auto 8rem;
+}
+
+section.no-second-row {
+	gap: 0 var(--gap-small);
+}
+
 h6 {
 	grid-area: symbol;
+	justify-self: center;
+}
+
+.toggle {
+	grid-area: toggle;
+	margin-left: auto;
+}
+
+[label='Open Matrix'] {
+	grid-area: open-matrix;
 }
 
 :deep([label='Name']) {
diff --git a/packages/client/hmi-client/src/components/model/tera-parameters-metadata.vue b/packages/client/hmi-client/src/components/model/tera-parameters-metadata.vue
index c708806ac0..e134210f8c 100644
--- a/packages/client/hmi-client/src/components/model/tera-parameters-metadata.vue
+++ b/packages/client/hmi-client/src/components/model/tera-parameters-metadata.vue
@@ -1,36 +1,114 @@
 <template>
 	<ul>
-		<li v-for="parameter in parameters" :key="parameter.id">
+		<li
+			v-for="({ baseParameter, childParameters, isVirtual }, index) in parameterList"
+			:key="baseParameter.id"
+		>
+			<template v-if="isVirtual">
+				<tera-parameter-metadata-entry
+					:parameter="baseParameter"
+					is-base
+					:show-stratified-variables="toggleStates[index]"
+					@toggle-stratified-variables="toggleStates[index] = !toggleStates[index]"
+					@update-parameter="updateBaseParameter(baseParameter.id, $event)"
+					@open-matrix="matrixModalId = baseParameter.id"
+				/>
+				<ul v-if="toggleStates[index]" class="stratified">
+					<li v-for="childParameter in childParameters" :key="childParameter.id">
+						<tera-parameter-metadata-entry
+							:parameter="childParameter"
+							is-stratified
+							@update-parameter="
+								$emit('update-parameter', { parameterId: childParameter.id, ...$event })
+							"
+						/>
+					</li>
+				</ul>
+			</template>
 			<tera-parameter-metadata-entry
-				:parameter="parameter"
-				@update-parameter="
-					emit('update-parameter', {
-						parameterId: parameter.id,
-						...$event
-					})
-				"
+				v-else
+				:parameter="baseParameter"
+				@update-parameter="$emit('update-parameter', { parameterId: baseParameter.id, ...$event })"
 			/>
 		</li>
 	</ul>
+	<teleport to="body">
+		<tera-stratified-matrix-modal
+			v-if="matrixModalId"
+			:id="matrixModalId"
+			:mmt="props.mmt"
+			:mmt-params="props.mmtParams"
+			:stratified-matrix-type="StratifiedMatrix.Parameters"
+			is-read-only
+			@close-modal="matrixModalId = ''"
+		/>
+	</teleport>
 </template>
 
 <script setup lang="ts">
-import { Model } from '@/types/Types';
+import { ref } from 'vue';
+import { Model, ModelParameter } from '@/types/Types';
+import { StratifiedMatrix } from '@/types/Model';
+import { MiraModel, MiraTemplateParams } from '@/model-representation/mira/mira-common';
 import { getParameters } from '@/model-representation/service';
+import { collapseParameters } from '@/model-representation/mira/mira';
 import TeraParameterMetadataEntry from '@/components/model/tera-parameter-metadata-entry.vue';
+import TeraStratifiedMatrixModal from './petrinet/model-configurations/tera-stratified-matrix-modal.vue';
 
 const props = defineProps<{
 	model: Model;
+	mmt: MiraModel;
+	mmtParams: MiraTemplateParams;
 }>();
 
 const emit = defineEmits(['update-parameter']);
 
 const parameters = getParameters(props.model);
+const collapsedParameters = collapseParameters(props.mmt, props.mmtParams);
+const parameterList = Array.from(collapsedParameters.keys())
+	.flat()
+	.map((id) => {
+		const childIds = collapsedParameters.get(id) ?? [];
+		const childParameters = childIds
+			.map((childId) => parameters.find((p) => p.id === childId))
+			.filter(Boolean) as ModelParameter[];
+		const isVirtual = childIds.length > 1;
+
+		// If the parameter is virtual, we need to get the parameter data from model.metadata
+		const baseParameter = isVirtual
+			? props.model.metadata?.parameters?.[id] ?? { id } // If we haven't saved it in the metadata yet, create it
+			: parameters.find((p) => p.id === id);
+
+		return { baseParameter, childParameters, isVirtual };
+	});
+
+const toggleStates = ref(Array.from({ length: collapsedParameters.size }, () => false));
+const matrixModalId = ref('');
+
+function updateBaseParameter(baseParameter: string, event: any) {
+	// In order to modify the base we need to do it within the model's metadata since it doesn't actually exist in the model
+	emit('update-parameter', { parameterId: baseParameter, isMetadata: true, ...event });
+	// Cascade the change to all children
+	const ids = collapsedParameters.get(baseParameter);
+	ids?.forEach((id) => emit('update-parameter', { parameterId: id, ...event }));
+}
 </script>
 
 <style scoped>
 li {
-	padding: var(--gap-small) 0;
+	padding-bottom: var(--gap-small);
 	border-bottom: 1px solid var(--surface-border);
 }
+
+.stratified {
+	gap: var(--gap-xsmall);
+	margin: var(--gap-small) 0 0 var(--gap-medium);
+
+	& > li {
+		border-left: 2px solid var(--primary-color-dark);
+		padding-left: var(--gap);
+		padding-bottom: 0;
+		border-bottom: none;
+	}
+}
 </style>
diff --git a/packages/client/hmi-client/src/components/model/tera-state-metadata-entry.vue b/packages/client/hmi-client/src/components/model/tera-state-metadata-entry.vue
new file mode 100644
index 0000000000..9d6f42a2ed
--- /dev/null
+++ b/packages/client/hmi-client/src/components/model/tera-state-metadata-entry.vue
@@ -0,0 +1,102 @@
+<template>
+	<section :class="{ 'has-toggle': isBase, 'no-second-row': isStratified }">
+		<h6>{{ id }}</h6>
+		<tera-input
+			label="Name"
+			:model-value="name ?? ''"
+			@update:model-value="$emit('update-state', { key: 'name', value: $event })"
+		/>
+		<!--FIXME: description property should be added to the state type-->
+		<tera-input
+			label="Description"
+			:model-value="''"
+			@update:model-value="
+				$emit('update-state', {
+					key: 'description',
+					value: $event
+				})
+			"
+			disabled
+		/>
+		<template v-if="!isStratified">
+			<Button
+				v-if="isBase"
+				:icon="showStratifiedVariables ? 'pi pi-chevron-down' : 'pi pi-chevron-right'"
+				text
+				rounded
+				@click="$emit('toggle-stratified-variables')"
+			/>
+			<tera-input
+				label="Unit"
+				:model-value="initial?.expression ?? ''"
+				@update:model-value="$emit('update-state', { key: 'units', value: $event })"
+			/>
+			<!--TODO: Add support for editing concepts-->
+			<tera-input label="Concept" :model-value="grounding?.identifiers[0] ?? ''" disabled />
+		</template>
+	</section>
+</template>
+
+<script setup lang="ts">
+import { PetriNetState, RegNetVertex } from '@/types/Types';
+import TeraInput from '@/components/widgets/tera-input.vue';
+import Button from 'primevue/button';
+
+const props = defineProps<{
+	state: PetriNetState | RegNetVertex;
+	isBase?: boolean;
+	isStratified?: boolean;
+	showStratifiedVariables?: boolean;
+}>();
+
+defineEmits(['update-state', 'toggle-stratified-variables', 'open-matrix']);
+
+const { id, name, grounding, initial } = props.state; // description property should be added to the state type
+</script>
+
+<style scoped>
+section {
+	display: grid;
+	grid-template-areas:
+		'symbol name description description'
+		'unit	unit concept .';
+	grid-template-columns: max-content 30% 30% auto;
+	gap: var(--gap-small);
+	align-items: center;
+}
+
+section.has-toggle {
+	grid-template-areas:
+		'symbol name description description'
+		'toggle	unit concept .';
+}
+
+section.no-second-row {
+	gap: 0 var(--gap-small);
+}
+
+h6 {
+	grid-area: symbol;
+	justify-self: center;
+}
+
+button {
+	grid-area: toggle;
+}
+
+:deep([label='Name']) {
+	grid-area: name;
+}
+
+:deep([label='Description']) {
+	grid-area: description;
+}
+
+:deep([label='Unit']) {
+	grid-area: unit;
+}
+
+:deep([label='Concept']) {
+	grid-area: concept;
+}
+</style>
diff --git a/packages/client/hmi-client/src/components/model/tera-states-metadata.vue b/packages/client/hmi-client/src/components/model/tera-states-metadata.vue
new file mode 100644
index 0000000000..381992125e
--- /dev/null
+++ b/packages/client/hmi-client/src/components/model/tera-states-metadata.vue
@@ -0,0 +1,94 @@
+<template>
+	<ul>
+		<li v-for="({ baseState, childStates, isVirtual }, index) in stateList" :key="baseState.id">
+			<template v-if="isVirtual">
+				<tera-state-metadata-entry
+					:state="baseState"
+					is-base
+					:show-stratified-variables="toggleStates[index]"
+					@toggle-stratified-variables="toggleStates[index] = !toggleStates[index]"
+					@update-state="updateBaseState(baseState.id, $event)"
+				/>
+				<ul v-if="toggleStates[index]" class="stratified">
+					<li v-for="childState in childStates" :key="childState.id">
+						<tera-state-metadata-entry
+							:state="childState"
+							is-stratified
+							@update-state="$emit('update-state', { id: childState.id, ...$event })"
+						/>
+					</li>
+				</ul>
+			</template>
+			<tera-state-metadata-entry
+				v-else
+				:state="baseState"
+				@update-state="$emit('update-state', { id: baseState.id, ...$event })"
+			/>
+		</li>
+	</ul>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { Model } from '@/types/Types';
+import { getStates } from '@/model-representation/service';
+import { MiraModel } from '@/model-representation/mira/mira-common';
+import { collapseInitials } from '@/model-representation/mira/mira';
+import TeraStateMetadataEntry from '@/components/model/tera-state-metadata-entry.vue';
+
+const props = defineProps<{
+	model: Model;
+	mmt: MiraModel;
+}>();
+
+const emit = defineEmits(['update-state']);
+
+const states = getStates(props.model); // could be states, vertices, and stocks type
+
+const collapsedInitials = collapseInitials(props.mmt);
+const stateList = Array.from(collapsedInitials.keys())
+	.flat()
+	.map((id) => {
+		const childTargets = collapsedInitials.get(id) ?? [];
+		const childStates = childTargets
+			.map((childTarget) => states.find((i: any) => i.id === childTarget))
+			.filter(Boolean);
+		const isVirtual = childTargets.length > 1;
+
+		// If the initial is virtual, we need to get it from model.metadata
+		const baseState = isVirtual
+			? props.model.metadata?.initials?.[id] ?? { id } // If we haven't saved it in the metadata yet, create it
+			: states.find((i: any) => i.id === id);
+
+		return { baseState, childStates, isVirtual };
+	});
+
+const toggleStates = ref(Array.from({ length: collapsedInitials.size }, () => false));
+
+function updateBaseState(baseId: string, event: any) {
+	// In order to modify the base we need to do it within the model's metadata since it doesn't actually exist in the model
+	emit('update-state', { id: baseId, isMetadata: true, ...event });
+	// Cascade the change to all children
+	const targets = collapsedInitials.get(baseId);
+	targets?.forEach((target) => emit('update-state', { id: target, ...event }));
+}
+</script>
+
+<style scoped>
+li {
+	padding-bottom: var(--gap-small);
+	border-bottom: 1px solid var(--surface-border);
+}
+
+.stratified {
+	gap: var(--gap-small);
+	margin: var(--gap-small) 0 0 var(--gap-medium);
+
+	& > li {
+		border-left: 2px solid var(--primary-color-dark);
+		padding-left: var(--gap);
+		padding-bottom: 0;
+		border-bottom: none;
+	}
+}
+</style>
diff --git a/packages/client/hmi-client/src/components/widgets/tera-columnar-panel.vue b/packages/client/hmi-client/src/components/widgets/tera-columnar-panel.vue
index 976c29241e..016576eb23 100644
--- a/packages/client/hmi-client/src/components/widgets/tera-columnar-panel.vue
+++ b/packages/client/hmi-client/src/components/widgets/tera-columnar-panel.vue
@@ -4,14 +4,14 @@
 	</main>
 </template>
 
-<script setup lang="ts"></script>
-
 <style scoped>
+/**FIXME: Moved these rules from tera-drilldown, Double check if this is really all needed, seems overkill */
 main {
 	display: grid;
 	grid-auto-flow: column;
 	grid-template-columns: repeat(auto-fit, minmax(0, 1fr));
 	overflow: hidden;
 	gap: var(--gap-small);
+	flex-grow: 1;
 }
 </style>
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 5368522a26..9f0e8c053f 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
@@ -127,7 +127,7 @@
 						<template #header>
 							Initial variable values<span class="artifact-amount">({{ numInitials }})</span>
 						</template>
-						<tera-initial-table-v2
+						<tera-initial-table
 							v-if="!isEmpty(knobs.transientModelConfig) && !isEmpty(mmt.initials) && model"
 							:model="model"
 							:model-configuration="knobs.transientModelConfig"
@@ -140,7 +140,7 @@
 						/>
 					</AccordionTab>
 				</Accordion>
-				<tera-parameter-table-v2
+				<tera-parameter-table
 					v-if="!isEmpty(knobs.transientModelConfig) && !isEmpty(mmt.parameters) && model"
 					:model="model"
 					:model-configuration="knobs.transientModelConfig"
@@ -291,8 +291,8 @@ import TeraModal from '@/components/widgets/tera-modal.vue';
 import teraNotebookJupyterThoughtOutput from '@/components/llm/tera-notebook-jupyter-thought-output.vue';
 
 import { FatalError } from '@/api/api';
-import TeraInitialTableV2 from '@/components/model/petrinet/tera-initial-table-v2.vue';
-import TeraParameterTableV2 from '@/components/model/petrinet/tera-parameter-table-v2.vue';
+import TeraInitialTable from '@/components/model/petrinet/tera-initial-table.vue';
+import TeraParameterTable from '@/components/model/petrinet/tera-parameter-table.vue';
 import {
 	emptyMiraModel,
 	generateModelDatasetConfigurationContext
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model/tera-model-workflow-wrapper.vue b/packages/client/hmi-client/src/components/workflow/ops/model/tera-model-workflow-wrapper.vue
index 4eda707f32..058823a1e6 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model/tera-model-workflow-wrapper.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model/tera-model-workflow-wrapper.vue
@@ -4,13 +4,12 @@
 		@on-close-clicked="emit('close')"
 		@update-state="(state: any) => emit('update-state', state)"
 	>
-		<section>
-			<tera-model
-				:asset-id="props.node.state.modelId as string"
-				@new-model-configuration="refreshModelNode"
-				@update-model-configuration="refreshModelNode"
-			/>
-		</section>
+		<tera-model
+			v-if="node.state.modelId"
+			:asset-id="node.state.modelId"
+			@new-model-configuration="refreshModelNode"
+			@update-model-configuration="refreshModelNode"
+		/>
 	</tera-drilldown>
 </template>
 
@@ -24,7 +23,7 @@ import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 
 import { ModelOperationState } from './model-operation';
 
-const props = defineProps<{
+defineProps<{
 	node: WorkflowNode<ModelOperationState>;
 }>();
 
diff --git a/packages/client/hmi-client/src/model-representation/service.ts b/packages/client/hmi-client/src/model-representation/service.ts
index 72442d62b2..0fa0b5713e 100644
--- a/packages/client/hmi-client/src/model-representation/service.ts
+++ b/packages/client/hmi-client/src/model-representation/service.ts
@@ -213,7 +213,7 @@ export function updateParameter(model: Model, parameterId: string, key: string,
 			if (!obj.units) obj.units = { expression: '', expression_mathml: '' };
 			obj.units.expression = value;
 			obj.units.expression_mathml = `<ci>${value}</ci>`;
-		} else {
+		} else if (obj[key]) {
 			obj[key] = value;
 		}
 	}
@@ -230,6 +230,38 @@ export function updateParameter(model: Model, parameterId: string, key: string,
 	updateProperty(auxiliary);
 }
 
+// Gets states, vertices, stocks
+export function getStates(model: Model): any[] {
+	const modelType = getModelType(model);
+	switch (modelType) {
+		case AMRSchemaNames.REGNET:
+			return model.model?.vertices ?? [];
+		case AMRSchemaNames.PETRINET:
+			return model.model?.states ?? [];
+		case AMRSchemaNames.STOCKFLOW:
+			return model.model?.stocks ?? [];
+		default:
+			return [];
+	}
+}
+
+export function updateState(model: Model, id: string, key: string, value: any) {
+	function updateProperty(obj: ModelParameter | any /** There is no auxiliary type yet */) {
+		// TODO: Add support for editing concept/grounding
+		if (key === 'initial') {
+			if (!obj.initial) obj.initial = { expression: '', expression_mathml: '' };
+			obj.initial.expression = value;
+			obj.initial.expression_mathml = `<ci>${value}</ci>`;
+		} else if (obj[key]) {
+			obj[key] = value;
+		}
+	}
+	const states = getStates(model);
+	const state = states.find((i: any) => i.id === id);
+	if (!state) return;
+	updateProperty(state);
+}
+
 /**
  * Retrieves the metadata for a specific initial in the model.
  * @param {Model} model - The model object.
@@ -306,6 +338,7 @@ export function getInitial(model: Model, target: string): Initial | undefined {
 	}
 }
 
+// TODO: These updateMetadata functions and even the updateParameter function share similar logic and can be refactored
 /**
  * Updates the metadata for a specific parameter in the model.
  * @param {Model} model - The model object.
@@ -323,8 +356,19 @@ export function updateParameterMetadata(
 		model.metadata ??= {};
 		model.metadata.parameters ??= {};
 		model.metadata.parameters[parameterId] ??= {};
+		model.metadata.parameters[parameterId].id = parameterId;
+	}
+	const parameterMetadata = model.metadata.parameters[parameterId];
+
+	// TODO: Add support for editing concept metadata
+	if (key === 'units') {
+		if (!parameterMetadata.units)
+			parameterMetadata.units = { expression: '', expression_mathml: '' };
+		parameterMetadata.units.expression = value;
+		parameterMetadata.units.expression_mathml = `<ci>${value}</ci>`;
+	} else {
+		parameterMetadata[key] = value;
 	}
-	model.metadata.parameters[parameterId][key] = value;
 }
 
 /**
@@ -339,14 +383,17 @@ export function updateInitialMetadata(model: Model, target: string, key: string,
 		model.metadata ??= {};
 		model.metadata.initials ??= {};
 		model.metadata.initials[target] ??= {};
+		model.metadata.initials[target].id = target;
 	}
+
 	const initialMetadata = model.metadata.initials[target];
 
 	// TODO: Add support for editing concept metadata
-	if (key === 'units') {
-		if (!initialMetadata.units) initialMetadata.units = { expression: '', expression_mathml: '' };
-		initialMetadata.units.expression = value;
-		initialMetadata.units.expression_mathml = `<ci>${value}</ci>`;
+	if (key === 'initial') {
+		if (!initialMetadata.initial)
+			initialMetadata.initial = { expression: '', expression_mathml: '' };
+		initialMetadata.initial.expression = value;
+		initialMetadata.initial.expression_mathml = `<ci>${value}</ci>`;
 	} else {
 		initialMetadata[key] = value;
 	}