diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/ConstraintValue.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/ConstraintValue.kt
index 550ad741e..f108c21aa 100644
--- a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/ConstraintValue.kt
+++ b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/ConstraintValue.kt
@@ -4,4 +4,5 @@ data class FromProcessRefValue<Q>(
     val name: String,
     val matchLabels: Map<String, StringValue<Q>> = emptyMap(),
     val arguments: Map<String, DataValue<Q>> = emptyMap(),
+    val pkg: PackageValue<Q>,
 )
diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/MatrixColumnIndex.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/MatrixColumnIndex.kt
index e8853e7fd..d867ff791 100644
--- a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/MatrixColumnIndex.kt
+++ b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/MatrixColumnIndex.kt
@@ -72,6 +72,7 @@ sealed interface SubstanceValue<Q> : Value<Q>, MatrixColumnIndex<Q>
 data class PartiallyQualifiedSubstanceValue<Q>(
     val name: String,
     val referenceUnit: UnitValue<Q>,
+    val pkg: PackageValue<Q>,
 ) : SubstanceValue<Q> {
     override fun getDimension(): Dimension {
         return referenceUnit.dimension
@@ -117,6 +118,7 @@ data class FullyQualifiedSubstanceValue<Q>(
     val compartment: String,
     val subcompartment: String?,
     val referenceUnit: UnitValue<Q>,
+    val pkg: PackageValue<Q>,
 ) : SubstanceValue<Q> {
     override fun getDimension(): Dimension {
         return referenceUnit.dimension
diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/PackageValue.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/PackageValue.kt
new file mode 100644
index 000000000..d37ddfc0f
--- /dev/null
+++ b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/value/PackageValue.kt
@@ -0,0 +1,8 @@
+package ch.kleis.lcaac.core.lang.value
+
+data class PackageValue<Q>(
+    val name: String,
+    val arguments: Map<String, DataValue<Q>> = emptyMap(),
+    val with: Map<String, ProductValue<Q>> = emptyMap(),
+)
+