diff --git a/BouncingBall/FMI2.xml b/BouncingBall/FMI2.xml
index 2f184d70..ddd99990 100644
--- a/BouncingBall/FMI2.xml
+++ b/BouncingBall/FMI2.xml
@@ -88,12 +88,12 @@
 
   <ModelStructure>
     <Outputs>
-      <Unknown index="2"/>
-      <Unknown index="4"/>
+      <Unknown index="2" dependencies=""/>
+      <Unknown index="4" dependencies=""/>
     </Outputs>
     <Derivatives>
-      <Unknown index="3"/>
-      <Unknown index="5"/>
+      <Unknown index="3" dependencies="4" dependenciesKind="constant"/>
+      <Unknown index="5" dependencies="6" dependenciesKind="constant"/>
     </Derivatives>
     <InitialUnknowns>
       <Unknown index="3" dependencies="4" dependenciesKind="constant"/>
diff --git a/BouncingBall/FMI3.xml b/BouncingBall/FMI3.xml
index 301d6e73..0caa8958 100644
--- a/BouncingBall/FMI3.xml
+++ b/BouncingBall/FMI3.xml
@@ -59,10 +59,10 @@
   </ModelVariables>
 
   <ModelStructure>
-    <Output valueReference="1"/>
-    <Output valueReference="3"/>
-    <ContinuousStateDerivative valueReference="2"/>
-    <ContinuousStateDerivative valueReference="4"/>
+    <Output valueReference="1" dependencies=""/>
+    <Output valueReference="3" dependencies=""/>
+    <ContinuousStateDerivative valueReference="2" dependencies="3" dependenciesKind="constant"/>
+    <ContinuousStateDerivative valueReference="4" dependencies="5" dependenciesKind="constant"/>
     <InitialUnknown valueReference="2" dependencies="3" dependenciesKind="constant"/>
     <InitialUnknown valueReference="4" dependencies="5" dependenciesKind="constant"/>
     <EventIndicator valueReference="1"/>
diff --git a/Dahlquist/FMI3.xml b/Dahlquist/FMI3.xml
index bd9421d0..8c7b0092 100644
--- a/Dahlquist/FMI3.xml
+++ b/Dahlquist/FMI3.xml
@@ -35,9 +35,9 @@
   </ModelVariables>
 
   <ModelStructure>
-    <Output valueReference="1"/>
-    <ContinuousStateDerivative valueReference="2"/>
-    <InitialUnknown valueReference="2"/>
+    <Output valueReference="1" dependencies=""/>
+    <ContinuousStateDerivative valueReference="2" dependencies="1" dependenciesKind="fixed"/>
+    <InitialUnknown valueReference="2" dependencies="2 4" dependenciesKind="dependent dependent"/>
   </ModelStructure>
 
 </fmiModelDescription>
diff --git a/VanDerPol/FMI3.xml b/VanDerPol/FMI3.xml
index 829ac44b..723645af 100644
--- a/VanDerPol/FMI3.xml
+++ b/VanDerPol/FMI3.xml
@@ -41,12 +41,12 @@
   </ModelVariables>
 
   <ModelStructure>
-    <Output valueReference="1"/>
-    <Output valueReference="3"/>
-    <ContinuousStateDerivative valueReference="2"/>
-    <ContinuousStateDerivative valueReference="4"/>
-    <InitialUnknown valueReference="2"/>
-    <InitialUnknown valueReference="4"/>
+    <Output valueReference="1" dependencies=""/>
+    <Output valueReference="3" dependencies=""/>
+    <ContinuousStateDerivative valueReference="2" dependencies="3" dependenciesKind="constant"/>
+    <ContinuousStateDerivative valueReference="4" dependencies="1 3" dependenciesKind="dependent dependent"/>
+    <InitialUnknown valueReference="2" dependencies="3" dependenciesKind="constant"/>
+    <InitialUnknown valueReference="4" dependencies="1 3 5" dependenciesKind="dependent dependent dependent"/>
   </ModelStructure>
 
 </fmiModelDescription>