diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.deployment
new file mode 100644
index 0000000000000000000000000000000000000000..337852e1788fa2da4ef922530076651baad0f288
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.deployment
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
+  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
+    <assemblyContext href="petsupplystore.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Auth --> C37">
+    <assemblyContext href="petsupplystore.system#_bfzh8Z64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C37">
+    <assemblyContext href="petsupplystore.system#_bm1-EZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo2TGWEeiZvO179UG_dA" name="Persistence --> C37">
+    <assemblyContext href="petsupplystore.system#_b7h0oZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsJ7UEeeYgrrytYLG1g" name="WebUi2-->C16">
+    <assemblyContext href="petsupplystore.system#_iki7wJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsZ7UEeeYgrrytYLG1g" name="Auth2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsp7UEeeYgrrytYLG1g" name="Image2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYZ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQtJ7UEeeYgrrytYLG1g" name="Persistence2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikppcJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1zGWEeiZvO179UG_dA" name="Image3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygjGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1TGWEeiZvO179UG_dA" name="WebUi3-->C34">
+    <assemblyContext href="petsupplystore.system#_vOQygDGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1jGWEeiZvO179UG_dA" name="Auth3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygTGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygzGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdDGXEeiZvO179UG_dA" name="WebUi4-->C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1DGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdTGXEeiZvO179UG_dA" name="Auth4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1TGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdjGXEeiZvO179UG_dA" name="Image4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1jGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdzGXEeiZvO179UG_dA" name="Persistence4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1zGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5DGXEeiZvO179UG_dA" name="WebUi5-->C44">
+    <assemblyContext href="petsupplystore.system#_bnysxDGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5TGXEeiZvO179UG_dA" name="Auth5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxTGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5jGXEeiZvO179UG_dA" name="Image5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxjGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5zGXEeiZvO179UG_dA" name="Persistence5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxzGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.repository b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.repository
new file mode 100644
index 0000000000000000000000000000000000000000..a3d32354fa28da8459da83192865e4cb252be48d
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.repository
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="ASCII"?>
+<repository:Repository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:parameterdependencies="http://www.descartes.tools/metamodel/parameterdependencies/1.0" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:resourcetype="http://www.descartes.tools/metamodel/resourcetype/1.0" xmlns:servicebehavior="http://www.descartes.tools/metamodel/servicebehavior/1.0" id="_O2wgMEcEEeOgk9V4uRCQAw" name="repositoryName">
+  <imports importURI="min.resourcetype"/>
+  <interfaces id="_Tq2AUUhvEeOHzfCev3b1wQ" name="IWebUI">
+    <signatures id="_aeA_cEh-EeOdTtmYhYAY2w" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_UFFL4p6vEeenbagyTTgVyA" name="IAuth">
+    <signatures id="_UFFL456vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_U7daQp6vEeenbagyTTgVyA" name="IImage">
+    <signatures id="_U7daQ56vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_rulXgzaOEeK3VJC2wj7WsA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_VK5kcp6vEeenbagyTTgVyA" name="IPersistence">
+    <signatures id="_VK5kc56vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <components xsi:type="repository:BasicComponent" id="_ePxeNEicEeOUHduTkzq26A" name="WebUi">
+    <interfaceProvidingRoles id="_fMTX4EicEeOUHduTkzq26A" name="IWebUI" interface="_Tq2AUUhvEeOHzfCev3b1wQ"/>
+    <interfaceRequiringRoles id="_AFUcYZ6wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_AmTpkZ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_rvGZcTGUEeiZvO179UG_dA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124145" independent="hgjhf yxcxy iupoztkj">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.003388"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="hgjhf"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.000795"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="yxcxy"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.00159"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="iupoztkj"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.00318"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="asdsaf" independent="hgjhf"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="dhsfgdfg" independent="yxcxy"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="jhfgjfg" independent="iupoztkj"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="poop" independent="hgjhf"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="klkllkas" independent="yxcxy"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="laskklkas" independent="iupoztkj"/>
+    <fineGrainedBehavior describedSignature="_aeA_cEh-EeOdTtmYhYAY2w" interfaceProvidingRole="_fMTX4EicEeOUHduTkzq26A">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="hgjhf" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="yxcxy" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="iupoztkj" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.2"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="asdsaf" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="dhsfgdfg" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="jhfgjfg" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.2"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="poop" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="klkllkas" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="laskklkas" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124145" characterization="EXPLICIT">
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_7HKD0J6wEeenbagyTTgVyA" name="IAuth" signature="_UFFL456vEeenbagyTTgVyA" interfaceRequiringRole="_AFUcYZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_-sZsMJ6wEeenbagyTTgVyA" name="IImage" signature="_U7daQ56vEeenbagyTTgVyA" interfaceRequiringRole="_AmTpkZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_oC7CoDGUEeiZvO179UG_dA" name="IPersistence" signature="_VK5kc56vEeenbagyTTgVyA" interfaceRequiringRole="_rvGZcTGUEeiZvO179UG_dA"/>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_H_1b5J6wEeenbagyTTgVyA" name="Auth">
+    <interfaceProvidingRoles id="_H_1b556wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_UFFL456vEeenbagyTTgVyA" interfaceProvidingRole="_H_1b556wEeenbagyTTgVyA">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124146" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.00056698"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_TCROlJ6wEeenbagyTTgVyA" name="Image">
+    <interfaceProvidingRoles id="_TCR1oJ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124147" independent="fgjhjfgh ghfjfghj dsaghadsh">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.0011508"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="dsaghadsh"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.000557"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="fgjhjfgh"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.001114"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="ghfjfghj"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.002228"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <fineGrainedBehavior describedSignature="_U7daQ56vEeenbagyTTgVyA" interfaceProvidingRole="_TCR1oJ6wEeenbagyTTgVyA">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="dsaghadsh" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="fgjhjfgh" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="ghfjfghj" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124147" characterization="EXPLICIT">
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_mBAwgp6wEeenbagyTTgVyA" name="Persistence">
+    <interfaceProvidingRoles id="_mBAwg56wEeenbagyTTgVyA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124149" independent="lkaslkas iopoiiop klaslkas">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.002159"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.0002312"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.0004624"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" />
+                <right xsi:type="functions:DoubleLiteral" value="0.0009248"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <fineGrainedBehavior describedSignature="_VK5kc56vEeenbagyTTgVyA" interfaceProvidingRole="_mBAwg56wEeenbagyTTgVyA">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="klaslkas" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="lkaslkas" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="iopoiiop" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124149" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.003166144"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+</repository:Repository>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.resourcelandscape b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.resourcelandscape
similarity index 98%
rename from dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.resourcelandscape
rename to dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.resourcelandscape
index ac874bece1f69ed263f637c3c5f1dcffdd6174e6..f5628167dbd1b423c212924a7603fc5752787e16 100644
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.resourcelandscape
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.resourcelandscape
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
-  <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
-    <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="C16">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="cores" number="16"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_DSaf8J6vEeenbagyTTgVyA" name="C34">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_DSaf8Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_DSaf8p6vEeenbagyTTgVyA" name="cores" number="16"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_EDFH4J6vEeenbagyTTgVyA" name="C37">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EDFH4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_EDFH4p6vEeenbagyTTgVyA" name="cores" number="16"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_EJLv4J6vEeenbagyTTgVyA" name="C38">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EJLv4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_EJLv4p6vEeenbagyTTgVyA" name="cores" number="16"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_EbzJ456vEeenbagyTTgVyA" name="C44">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EbzJ5J6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_EbzJ5Z6vEeenbagyTTgVyA" name="cores" number="16"/>
-      </configSpec>
-    </computeNodes>
-  </consistsOf>
-</resourcelandscape:DistributedDataCenter>
+<?xml version="1.0" encoding="UTF-8"?>
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
+  <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
+    <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="C16">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_DSaf8J6vEeenbagyTTgVyA" name="C34">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_DSaf8Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_DSaf8p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EDFH4J6vEeenbagyTTgVyA" name="C37">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EDFH4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EDFH4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EJLv4J6vEeenbagyTTgVyA" name="C38">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EJLv4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EJLv4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EbzJ456vEeenbagyTTgVyA" name="C44">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EbzJ5J6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EbzJ5Z6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+  </consistsOf>
+</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.system
new file mode 100644
index 0000000000000000000000000000000000000000..216f12c9e779ed8d70112c06db901632562a50e7
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.system
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ASCII"?>
+<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
+  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Auth">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_iki7wJ7TEeeYgrrytYLG1g" name="WebUi2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYJ7TEeeYgrrytYLG1g" name="Auth2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYZ7TEeeYgrrytYLG1g" name="Image2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikppcJ7TEeeYgrrytYLG1g" name="Persistence2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygDGVEeiZvO179UG_dA" name="WebUi3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygTGVEeiZvO179UG_dA" name="Auth3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygjGVEeiZvO179UG_dA" name="Image3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygzGVEeiZvO179UG_dA" name="Persistence3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1DGWEeiZvO179UG_dA" name="WebUi4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1TGWEeiZvO179UG_dA" name="Auth4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1jGWEeiZvO179UG_dA" name="Image4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1zGWEeiZvO179UG_dA" name="Persistence4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxDGWEeiZvO179UG_dA" name="WebUi5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxTGWEeiZvO179UG_dA" name="Auth5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxjGWEeiZvO179UG_dA" name="Image5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxzGWEeiZvO179UG_dA" name="Persistence5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Auth" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="WebUi --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6Np7TEeeYgrrytYLG1g" name="WebUi2 --> Persistence2" providingAssemblyContext="_ikppcJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NJ7TEeeYgrrytYLG1g" name="WebUi2 --> Auth2" providingAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NZ7TEeeYgrrytYLG1g" name="WebUi2 --> Image2" providingAssemblyContext="_ikpCYZ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hwzGVEeiZvO179UG_dA" name="WebUi3 --> Auth3" providingAssemblyContext="_vOQygTGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxDGVEeiZvO179UG_dA" name="WebUi3 --> Image3" providingAssemblyContext="_vOQygjGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxTGVEeiZvO179UG_dA" name="WebUi3 --> Persistence3" providingAssemblyContext="_vOQygzGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76szGWEeiZvO179UG_dA" name="WebUi4 --> Auth4" providingAssemblyContext="_MBHS1TGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tDGWEeiZvO179UG_dA" name="WebUi4 --> Image4" providingAssemblyContext="_MBHS1jGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tTGWEeiZvO179UG_dA" name="WebUi4 --> Persistence4" providingAssemblyContext="_MBHS1zGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7QzGWEeiZvO179UG_dA" name="WebUi5 --> Auth5" providingAssemblyContext="_bnysxTGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RDGWEeiZvO179UG_dA" name="WebUi5 --> Image5" providingAssemblyContext="_bnysxjGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RTGWEeiZvO179UG_dA" name="WebUi5 --> Persistence5" providingAssemblyContext="_bnysxzGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_4v0EEp7TEeeYgrrytYLG1g" name="OuterWebUi2ToInnerWebUi2" assemblyContext="_iki7wJ7TEeeYgrrytYLG1g" outerInterfaceProvidingRole="_1kuBFJ7TEeeYgrrytYLG1g">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_CFbFwTGWEeiZvO179UG_dA" name="OuterWebUi3ToInnerWebUi3" assemblyContext="_vOQygDGVEeiZvO179UG_dA" outerInterfaceProvidingRole="_A2yIYTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_XUpckTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi4" assemblyContext="_MBHS1DGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_WJAv4TGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_m3s6wTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi5" assemblyContext="_bnysxDGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_lB52wTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_1kuBFJ7TEeeYgrrytYLG1g" name="IWebUI2">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_A2yIYTGWEeiZvO179UG_dA" name="IWebUI3">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_WJAv4TGWEeiZvO179UG_dA" name="IWebUI4">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_lB52wTGWEeiZvO179UG_dA" name="IWebUI5">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.usageprofile
new file mode 100644
index 0000000000000000000000000000000000000000..f61432db700ffba58cd38d2c02d26fb21b9d1380
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-large/petsupplystore.usageprofile
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ASCII"?>
+<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
+    <scenarioBehavior>
+      <actions xsi:type="usageprofile:BranchUserAction">
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ALS-MZ7UEeeYgrrytYLG1g" name="Call_addItemToCart">
+            <providingRole href="petsupplystore.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.99"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ASOsoZ7UEeeYgrrytYLG1g" name="Call2_addItemToCart">
+            <providingRole href="petsupplystore.system#_1kuBFJ7TEeeYgrrytYLG1g"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.99"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nUiyUTGXEeiZvO179UG_dA" name="Call3_addItemToCart">
+            <providingRole href="petsupplystore.system#_A2yIYTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.99"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nlibsTGXEeiZvO179UG_dA" name="Call4_addItemToCart">
+            <providingRole href="petsupplystore.system#_WJAv4TGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.99"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ntxxsTGXEeiZvO179UG_dA" name="Call5_addItemToCart">
+            <providingRole href="petsupplystore.system#_lB52wTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.99"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branchingProbabilities>
+          <probFunction xsi:type="functions:ProbabilityMassFunction">
+            <samples xsi:type="functions:EnumSampleList">
+              <items value="Branch1" probability="0.2"/>
+              <items value="Branch2" probability="0.2"/>
+              <items value="Branch3" probability="0.2"/>
+              <items value="Branch4" probability="0.2"/>
+              <items value="Branch5" probability="0.2"/>
+            </samples>
+          </probFunction>
+        </branchingProbabilities>
+      </actions>
+    </scenarioBehavior>
+    <workloadType xsi:type="usageprofile:OpenWorkloadType">
+      <interArrivalTime>
+        <probFunction xsi:type="functions:ExponentialDistribution" rate="1000"/>
+      </interArrivalTime>
+    </workloadType>
+  </usageScenarios>
+</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.deployment
new file mode 100644
index 0000000000000000000000000000000000000000..337852e1788fa2da4ef922530076651baad0f288
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.deployment
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
+  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
+    <assemblyContext href="petsupplystore.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Auth --> C37">
+    <assemblyContext href="petsupplystore.system#_bfzh8Z64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C37">
+    <assemblyContext href="petsupplystore.system#_bm1-EZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo2TGWEeiZvO179UG_dA" name="Persistence --> C37">
+    <assemblyContext href="petsupplystore.system#_b7h0oZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsJ7UEeeYgrrytYLG1g" name="WebUi2-->C16">
+    <assemblyContext href="petsupplystore.system#_iki7wJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsZ7UEeeYgrrytYLG1g" name="Auth2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsp7UEeeYgrrytYLG1g" name="Image2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYZ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQtJ7UEeeYgrrytYLG1g" name="Persistence2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikppcJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1zGWEeiZvO179UG_dA" name="Image3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygjGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1TGWEeiZvO179UG_dA" name="WebUi3-->C34">
+    <assemblyContext href="petsupplystore.system#_vOQygDGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1jGWEeiZvO179UG_dA" name="Auth3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygTGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygzGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdDGXEeiZvO179UG_dA" name="WebUi4-->C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1DGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdTGXEeiZvO179UG_dA" name="Auth4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1TGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdjGXEeiZvO179UG_dA" name="Image4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1jGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdzGXEeiZvO179UG_dA" name="Persistence4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1zGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5DGXEeiZvO179UG_dA" name="WebUi5-->C44">
+    <assemblyContext href="petsupplystore.system#_bnysxDGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5TGXEeiZvO179UG_dA" name="Auth5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxTGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5jGXEeiZvO179UG_dA" name="Image5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxjGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5zGXEeiZvO179UG_dA" name="Persistence5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxzGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.repository b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.repository
new file mode 100644
index 0000000000000000000000000000000000000000..a3d32354fa28da8459da83192865e4cb252be48d
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.repository
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="ASCII"?>
+<repository:Repository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:parameterdependencies="http://www.descartes.tools/metamodel/parameterdependencies/1.0" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:resourcetype="http://www.descartes.tools/metamodel/resourcetype/1.0" xmlns:servicebehavior="http://www.descartes.tools/metamodel/servicebehavior/1.0" id="_O2wgMEcEEeOgk9V4uRCQAw" name="repositoryName">
+  <imports importURI="min.resourcetype"/>
+  <interfaces id="_Tq2AUUhvEeOHzfCev3b1wQ" name="IWebUI">
+    <signatures id="_aeA_cEh-EeOdTtmYhYAY2w" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_UFFL4p6vEeenbagyTTgVyA" name="IAuth">
+    <signatures id="_UFFL456vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_U7daQp6vEeenbagyTTgVyA" name="IImage">
+    <signatures id="_U7daQ56vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_rulXgzaOEeK3VJC2wj7WsA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <interfaces id="_VK5kcp6vEeenbagyTTgVyA" name="IPersistence">
+    <signatures id="_VK5kc56vEeenbagyTTgVyA" name="categoryView">
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage5">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage10">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+      <parameters xsi:type="repository:InputParameter" name="TrafficPercentage20">
+        <dataType xsi:type="repository:PrimitiveDataType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/primitivetypes.repository#_M22LwTPEEeKm3rw9pvZMDA"/>
+      </parameters>
+    </signatures>
+  </interfaces>
+  <components xsi:type="repository:BasicComponent" id="_ePxeNEicEeOUHduTkzq26A" name="WebUi">
+    <interfaceProvidingRoles id="_fMTX4EicEeOUHduTkzq26A" name="IWebUI" interface="_Tq2AUUhvEeOHzfCev3b1wQ"/>
+    <interfaceRequiringRoles id="_AFUcYZ6wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_AmTpkZ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_rvGZcTGUEeiZvO179UG_dA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124145" independent="hgjhf yxcxy iupoztkj">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.003388"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="hgjhf"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.000795"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="yxcxy"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.00159"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="iupoztkj"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.00318"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="asdsaf" independent="hgjhf"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="dhsfgdfg" independent="yxcxy"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="jhfgjfg" independent="iupoztkj"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="poop" independent="hgjhf"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="klkllkas" independent="yxcxy"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="IDENTITY" dependent="laskklkas" independent="iupoztkj"/>
+    <fineGrainedBehavior describedSignature="_aeA_cEh-EeOdTtmYhYAY2w" interfaceProvidingRole="_fMTX4EicEeOUHduTkzq26A">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="hgjhf" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="yxcxy" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="iupoztkj" providingRole="_fMTX4EicEeOUHduTkzq26A" parameter="//@interfaces.0/@signatures.0/@parameters.2"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="asdsaf" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="dhsfgdfg" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="jhfgjfg" externalCall="_-sZsMJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.2"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="poop" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="klkllkas" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ExternalCallParameter" id="laskklkas" externalCall="_oC7CoDGUEeiZvO179UG_dA" parameter="//@interfaces.3/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124145" characterization="EXPLICIT">
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_7HKD0J6wEeenbagyTTgVyA" name="IAuth" signature="_UFFL456vEeenbagyTTgVyA" interfaceRequiringRole="_AFUcYZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_-sZsMJ6wEeenbagyTTgVyA" name="IImage" signature="_U7daQ56vEeenbagyTTgVyA" interfaceRequiringRole="_AmTpkZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_oC7CoDGUEeiZvO179UG_dA" name="IPersistence" signature="_VK5kc56vEeenbagyTTgVyA" interfaceRequiringRole="_rvGZcTGUEeiZvO179UG_dA"/>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_H_1b5J6wEeenbagyTTgVyA" name="Auth">
+    <interfaceProvidingRoles id="_H_1b556wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_UFFL456vEeenbagyTTgVyA" interfaceProvidingRole="_H_1b556wEeenbagyTTgVyA">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124146" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.00056698"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_TCROlJ6wEeenbagyTTgVyA" name="Image">
+    <interfaceProvidingRoles id="_TCR1oJ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124147" independent="fgjhjfgh ghfjfghj dsaghadsh">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.0011508"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="dsaghadsh"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.000557"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="fgjhjfgh"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.001114"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" relationshipVariable="ghfjfghj"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.002228"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <fineGrainedBehavior describedSignature="_U7daQ56vEeenbagyTTgVyA" interfaceProvidingRole="_TCR1oJ6wEeenbagyTTgVyA">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="dsaghadsh" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="fgjhjfgh" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="ghfjfghj" providingRole="_TCR1oJ6wEeenbagyTTgVyA" parameter="//@interfaces.2/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124147" characterization="EXPLICIT">
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_mBAwgp6wEeenbagyTTgVyA" name="Persistence">
+    <interfaceProvidingRoles id="_mBAwg56wEeenbagyTTgVyA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <relationships xsi:type="parameterdependencies:DependencyRelationship" characterization="EXPLICIT" dependent="12341235124149" independent="lkaslkas iopoiiop klaslkas">
+      <explicitDescription>
+        <expression xsi:type="functions:Term">
+          <left xsi:type="functions:DoubleLiteral" value="0.002159"/>
+          <right xsi:type="functions:Term">
+            <left xsi:type="functions:Product">
+              <left xsi:type="functions:InfluencingParameterValue"/>
+              <right xsi:type="functions:DoubleLiteral" value="0.0002312"/>
+            </left>
+            <right xsi:type="functions:Term">
+              <left xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue"/>
+                <right xsi:type="functions:DoubleLiteral" value="0.0004624"/>
+              </left>
+              <right xsi:type="functions:Product">
+                <left xsi:type="functions:InfluencingParameterValue" />
+                <right xsi:type="functions:DoubleLiteral" value="0.0009248"/>
+              </right>
+            </right>
+          </right>
+        </expression>
+      </explicitDescription>
+    </relationships>
+    <fineGrainedBehavior describedSignature="_VK5kc56vEeenbagyTTgVyA" interfaceProvidingRole="_mBAwg56wEeenbagyTTgVyA">
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="klaslkas" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.0"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="lkaslkas" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.1"/>
+      <callParameter xsi:type="parameterdependencies:ServiceInputParameter" id="iopoiiop" providingRole="_mBAwg56wEeenbagyTTgVyA" parameter="//@interfaces.3/@signatures.0/@parameters.2"/>
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124149" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.003166144"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+</repository:Repository>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.resourcelandscape b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.resourcelandscape
new file mode 100644
index 0000000000000000000000000000000000000000..f5628167dbd1b423c212924a7603fc5752787e16
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.resourcelandscape
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
+  <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
+    <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="C16">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_DSaf8J6vEeenbagyTTgVyA" name="C34">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_DSaf8Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_DSaf8p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EDFH4J6vEeenbagyTTgVyA" name="C37">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EDFH4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EDFH4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EJLv4J6vEeenbagyTTgVyA" name="C38">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EJLv4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EJLv4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EbzJ456vEeenbagyTTgVyA" name="C44">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EbzJ5J6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EbzJ5Z6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+  </consistsOf>
+</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.system
new file mode 100644
index 0000000000000000000000000000000000000000..216f12c9e779ed8d70112c06db901632562a50e7
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.system
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ASCII"?>
+<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
+  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Auth">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_iki7wJ7TEeeYgrrytYLG1g" name="WebUi2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYJ7TEeeYgrrytYLG1g" name="Auth2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYZ7TEeeYgrrytYLG1g" name="Image2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikppcJ7TEeeYgrrytYLG1g" name="Persistence2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygDGVEeiZvO179UG_dA" name="WebUi3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygTGVEeiZvO179UG_dA" name="Auth3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygjGVEeiZvO179UG_dA" name="Image3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygzGVEeiZvO179UG_dA" name="Persistence3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1DGWEeiZvO179UG_dA" name="WebUi4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1TGWEeiZvO179UG_dA" name="Auth4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1jGWEeiZvO179UG_dA" name="Image4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1zGWEeiZvO179UG_dA" name="Persistence4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxDGWEeiZvO179UG_dA" name="WebUi5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxTGWEeiZvO179UG_dA" name="Auth5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxjGWEeiZvO179UG_dA" name="Image5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxzGWEeiZvO179UG_dA" name="Persistence5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Auth" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="WebUi --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6Np7TEeeYgrrytYLG1g" name="WebUi2 --> Persistence2" providingAssemblyContext="_ikppcJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NJ7TEeeYgrrytYLG1g" name="WebUi2 --> Auth2" providingAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NZ7TEeeYgrrytYLG1g" name="WebUi2 --> Image2" providingAssemblyContext="_ikpCYZ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hwzGVEeiZvO179UG_dA" name="WebUi3 --> Auth3" providingAssemblyContext="_vOQygTGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxDGVEeiZvO179UG_dA" name="WebUi3 --> Image3" providingAssemblyContext="_vOQygjGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxTGVEeiZvO179UG_dA" name="WebUi3 --> Persistence3" providingAssemblyContext="_vOQygzGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76szGWEeiZvO179UG_dA" name="WebUi4 --> Auth4" providingAssemblyContext="_MBHS1TGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tDGWEeiZvO179UG_dA" name="WebUi4 --> Image4" providingAssemblyContext="_MBHS1jGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tTGWEeiZvO179UG_dA" name="WebUi4 --> Persistence4" providingAssemblyContext="_MBHS1zGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7QzGWEeiZvO179UG_dA" name="WebUi5 --> Auth5" providingAssemblyContext="_bnysxTGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RDGWEeiZvO179UG_dA" name="WebUi5 --> Image5" providingAssemblyContext="_bnysxjGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RTGWEeiZvO179UG_dA" name="WebUi5 --> Persistence5" providingAssemblyContext="_bnysxzGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_4v0EEp7TEeeYgrrytYLG1g" name="OuterWebUi2ToInnerWebUi2" assemblyContext="_iki7wJ7TEeeYgrrytYLG1g" outerInterfaceProvidingRole="_1kuBFJ7TEeeYgrrytYLG1g">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_CFbFwTGWEeiZvO179UG_dA" name="OuterWebUi3ToInnerWebUi3" assemblyContext="_vOQygDGVEeiZvO179UG_dA" outerInterfaceProvidingRole="_A2yIYTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_XUpckTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi4" assemblyContext="_MBHS1DGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_WJAv4TGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_m3s6wTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi5" assemblyContext="_bnysxDGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_lB52wTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_1kuBFJ7TEeeYgrrytYLG1g" name="IWebUI2">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_A2yIYTGWEeiZvO179UG_dA" name="IWebUI3">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_WJAv4TGWEeiZvO179UG_dA" name="IWebUI4">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_lB52wTGWEeiZvO179UG_dA" name="IWebUI5">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.usageprofile
new file mode 100644
index 0000000000000000000000000000000000000000..3e497090658947cb8f0ba8709ce8d8c017bf6f9c
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/parameteric-small/petsupplystore.usageprofile
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ASCII"?>
+<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
+    <scenarioBehavior>
+      <actions xsi:type="usageprofile:BranchUserAction">
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ALS-MZ7UEeeYgrrytYLG1g" name="Call_addItemToCart">
+            <providingRole href="petsupplystore.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.9"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.09"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ASOsoZ7UEeeYgrrytYLG1g" name="Call2_addItemToCart">
+            <providingRole href="petsupplystore.system#_1kuBFJ7TEeeYgrrytYLG1g"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.9"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.09"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nUiyUTGXEeiZvO179UG_dA" name="Call3_addItemToCart">
+            <providingRole href="petsupplystore.system#_A2yIYTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.9"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.09"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nlibsTGXEeiZvO179UG_dA" name="Call4_addItemToCart">
+            <providingRole href="petsupplystore.system#_WJAv4TGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.9"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.09"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ntxxsTGXEeiZvO179UG_dA" name="Call5_addItemToCart">
+            <providingRole href="petsupplystore.system#_lB52wTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.9"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.0"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.09"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.1"/>
+            </inputParameterSettings>
+            <inputParameterSettings>
+              <value>
+                <probFunction xsi:type="functions:DoubleLiteral" value="0.01"/>
+              </value>
+              <parameter href="petsupplystore.repository#//@interfaces.0/@signatures.0/@parameters.2"/>
+            </inputParameterSettings>
+          </actions>
+        </branches>
+        <branchingProbabilities>
+          <probFunction xsi:type="functions:ProbabilityMassFunction">
+            <samples xsi:type="functions:EnumSampleList">
+              <items value="Branch1" probability="0.2"/>
+              <items value="Branch2" probability="0.2"/>
+              <items value="Branch3" probability="0.2"/>
+              <items value="Branch4" probability="0.2"/>
+              <items value="Branch5" probability="0.2"/>
+            </samples>
+          </probFunction>
+        </branchingProbabilities>
+      </actions>
+    </scenarioBehavior>
+    <workloadType xsi:type="usageprofile:OpenWorkloadType">
+      <interArrivalTime>
+        <probFunction xsi:type="functions:ExponentialDistribution" rate="1000"/>
+      </interArrivalTime>
+    </workloadType>
+  </usageScenarios>
+</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.deployment
deleted file mode 100644
index 9c4b16ab1756903761b536dd660d2092d1b00fd9..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.deployment
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
-  <system href="petsupplystore_2stacks.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
-    <assemblyContext href="petsupplystore_2stacks.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Store --> C38">
-    <assemblyContext href="petsupplystore_2stacks.system#_bfzh8Z64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C37">
-    <assemblyContext href="petsupplystore_2stacks.system#_bm1-EZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_V17S4J65EeenbagyTTgVyA" name="Recommender --> C38">
-    <assemblyContext href="petsupplystore_2stacks.system#_byqMgZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence --> C37">
-    <assemblyContext href="petsupplystore_2stacks.system#_b7h0oZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.system
deleted file mode 100644
index fc9da1d4e13cc606f537590d6ca90d980584cf08..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.system
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
-  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Store">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_byqMgZ64EeenbagyTTgVyA" name="Recommender">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_eviG8p6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Store" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="Store --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5Z6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_rHV3gZ64EeenbagyTTgVyA" name="Store --> Recommender" providingAssemblyContext="_byqMgZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5p6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_eviG856wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
-    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
-    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.usageprofile
deleted file mode 100644
index 052ef35d97932de544e263ec95a0a4dd94c25ba7..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_2stacks.usageprofile
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
-  <system href="petsupplystore_2stacks.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="Call_addItemToCart">
-        <providingRole href="petsupplystore_2stacks.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
-        <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="200"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.deployment
deleted file mode 100644
index 993e6c850d809f40d8b08cf75547e2eb4a4eb534..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.deployment
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
-  <system href="petsupplystore_4stacks.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
-    <assemblyContext href="petsupplystore_4stacks.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Store --> C38">
-    <assemblyContext href="petsupplystore_4stacks.system#_bfzh8Z64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C37">
-    <assemblyContext href="petsupplystore_4stacks.system#_bm1-EZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_V17S4J65EeenbagyTTgVyA" name="Recommender --> C38">
-    <assemblyContext href="petsupplystore_4stacks.system#_byqMgZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence --> C37">
-    <assemblyContext href="petsupplystore_4stacks.system#_b7h0oZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_PHfQsJ7UEeeYgrrytYLG1g" name="WebUi2-->C34">
-    <assemblyContext href="petsupplystore_4stacks.system#_iki7wJ7TEeeYgrrytYLG1g"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_PHfQsZ7UEeeYgrrytYLG1g" name="Store2 --> C16">
-    <assemblyContext href="petsupplystore_4stacks.system#_ikpCYJ7TEeeYgrrytYLG1g"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_PHfQsp7UEeeYgrrytYLG1g" name="Image2 --> C34">
-    <assemblyContext href="petsupplystore_4stacks.system#_ikpCYZ7TEeeYgrrytYLG1g"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_PHfQs57UEeeYgrrytYLG1g" name="Recommender2 --> C16">
-    <assemblyContext href="petsupplystore_4stacks.system#_ikpCYp7TEeeYgrrytYLG1g"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_PHfQtJ7UEeeYgrrytYLG1g" name="Persistence2 --> C34">
-    <assemblyContext href="petsupplystore_4stacks.system#_ikppcJ7TEeeYgrrytYLG1g"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.system
deleted file mode 100644
index 3d171c3cb4c663380b1626034fda568230008ef7..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.system
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
-  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Store">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_byqMgZ64EeenbagyTTgVyA" name="Recommender">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_eviG8p6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_iki7wJ7TEeeYgrrytYLG1g" name="WebUi2">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
-  </assemblyContexts>
-  <assemblyContexts id="_ikpCYJ7TEeeYgrrytYLG1g" name="Store2">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_ikpCYZ7TEeeYgrrytYLG1g" name="Image2">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_ikpCYp7TEeeYgrrytYLG1g" name="Recommender2">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_eviG8p6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_ikppcJ7TEeeYgrrytYLG1g" name="Persistence2">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Store" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="Store --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5Z6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_rHV3gZ64EeenbagyTTgVyA" name="Store --> Recommender" providingAssemblyContext="_byqMgZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5p6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_eviG856wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_nJH6NJ7TEeeYgrrytYLG1g" name="WebUi --> Store" providingAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
-    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_nJH6NZ7TEeeYgrrytYLG1g" name="WebUi --> Image" providingAssemblyContext="_ikpCYZ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
-    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_nJH6Np7TEeeYgrrytYLG1g" name="Store --> Persistence" providingAssemblyContext="_ikppcJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5Z6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_nJH6N57TEeeYgrrytYLG1g" name="Store --> Recommender" providingAssemblyContext="_ikpCYp7TEeeYgrrytYLG1g" requiringAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5p6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_eviG856wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
-    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
-  </providingDelegationConnectors>
-  <providingDelegationConnectors id="_4v0EEp7TEeeYgrrytYLG1g" name="OuterWebUi2ToInnerWebUi2" assemblyContext="_iki7wJ7TEeeYgrrytYLG1g" outerInterfaceProvidingRole="_1kuBFJ7TEeeYgrrytYLG1g">
-    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
-    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
-  </interfaceProvidingRoles>
-  <interfaceProvidingRoles id="_1kuBFJ7TEeeYgrrytYLG1g" name="IWebUI2">
-    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.usageprofile
deleted file mode 100644
index 8084b28dd7053ea4d8f602c4a9e46f1414bc45ef..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_4stacks.usageprofile
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
-  <system href="petsupplystore_4stacks.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:BranchUserAction">
-        <branches>
-          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ALS-MZ7UEeeYgrrytYLG1g" name="Call_addItemToCart">
-            <providingRole href="petsupplystore_4stacks.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
-            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
-          </actions>
-        </branches>
-        <branches>
-          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ASOsoZ7UEeeYgrrytYLG1g" name="Call2_addItemToCart">
-            <providingRole href="petsupplystore_4stacks.system#_1kuBFJ7TEeeYgrrytYLG1g"/>
-            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
-          </actions>
-        </branches>
-        <branchingProbabilities>
-          <probFunction xsi:type="functions:DoubleLiteral" value="0.5"/>
-        </branchingProbabilities>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="200"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.deployment
deleted file mode 100644
index c89db8dd483ae3b137ebe6d13f885604ff49ce77..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.deployment
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
-  <system href="petsupplystore_distributed.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
-    <assemblyContext href="petsupplystore_distributed.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Store --> C38">
-    <assemblyContext href="petsupplystore_distributed.system#_bfzh8Z64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C44">
-    <assemblyContext href="petsupplystore_distributed.system#_bm1-EZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-  <deploymentContexts id="_V17S4J65EeenbagyTTgVyA" name="Recommender --> C16">
-    <assemblyContext href="petsupplystore_distributed.system#_byqMgZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence --> C34">
-    <assemblyContext href="petsupplystore_distributed.system#_b7h0oZ64EeenbagyTTgVyA"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.system
deleted file mode 100644
index fc9da1d4e13cc606f537590d6ca90d980584cf08..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.system
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
-  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Store">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_byqMgZ64EeenbagyTTgVyA" name="Recommender">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_eviG8p6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
-  </assemblyContexts>
-  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Store" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
-    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="Store --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5Z6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_rHV3gZ64EeenbagyTTgVyA" name="Store --> Recommender" providingAssemblyContext="_byqMgZ64EeenbagyTTgVyA" requiringAssemblyContext="_bfzh8Z64EeenbagyTTgVyA">
-    <interfaceRequiringRole href="petsupplystore.repository#_H_1b5p6wEeenbagyTTgVyA"/>
-    <interfaceProvidingRole href="petsupplystore.repository#_eviG856wEeenbagyTTgVyA"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
-    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
-    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.usageprofile
deleted file mode 100644
index 58502039343d78d178614076123941e56ff3ad84..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore_distributed.usageprofile
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
-  <system href="petsupplystore_distributed.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="Call_addItemToCart">
-        <providingRole href="petsupplystore_distributed.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
-        <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="200"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.deployment b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.deployment
new file mode 100644
index 0000000000000000000000000000000000000000..337852e1788fa2da4ef922530076651baad0f288
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.deployment
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment:Deployment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:deployment="http://www.descartes.tools/metamodel/deployment/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_04BXQOa4EeGWevb6qKkohg" name="depl">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <targetResourceLandscape href="petsupplystore.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
+  <deploymentContexts id="_XCpjIEnvEeOWVc_o6w1CBw" name="WebUi-->C37">
+    <assemblyContext href="petsupplystore.system#_5QiUIEeoEeSW4Op0B0CyhQ"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VTR40J65EeenbagyTTgVyA" name="Auth --> C37">
+    <assemblyContext href="petsupplystore.system#_bfzh8Z64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_VjNLMJ65EeenbagyTTgVyA" name="Image --> C37">
+    <assemblyContext href="petsupplystore.system#_bm1-EZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo2TGWEeiZvO179UG_dA" name="Persistence --> C37">
+    <assemblyContext href="petsupplystore.system#_b7h0oZ64EeenbagyTTgVyA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EDFH4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsJ7UEeeYgrrytYLG1g" name="WebUi2-->C16">
+    <assemblyContext href="petsupplystore.system#_iki7wJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsZ7UEeeYgrrytYLG1g" name="Auth2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQsp7UEeeYgrrytYLG1g" name="Image2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikpCYZ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_PHfQtJ7UEeeYgrrytYLG1g" name="Persistence2 --> C16">
+    <assemblyContext href="petsupplystore.system#_ikppcJ7TEeeYgrrytYLG1g"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1zGWEeiZvO179UG_dA" name="Image3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygjGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1TGWEeiZvO179UG_dA" name="WebUi3-->C34">
+    <assemblyContext href="petsupplystore.system#_vOQygDGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_8hDo1jGWEeiZvO179UG_dA" name="Auth3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygTGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_WDiREJ65EeenbagyTTgVyA" name="Persistence3 --> C34">
+    <assemblyContext href="petsupplystore.system#_vOQygzGVEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_DSaf8J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdDGXEeiZvO179UG_dA" name="WebUi4-->C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1DGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdTGXEeiZvO179UG_dA" name="Auth4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1TGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdjGXEeiZvO179UG_dA" name="Image4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1jGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_S2mHdzGXEeiZvO179UG_dA" name="Persistence4 --> C38">
+    <assemblyContext href="petsupplystore.system#_MBHS1zGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EJLv4J6vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5DGXEeiZvO179UG_dA" name="WebUi5-->C44">
+    <assemblyContext href="petsupplystore.system#_bnysxDGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5TGXEeiZvO179UG_dA" name="Auth5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxTGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5jGXEeiZvO179UG_dA" name="Image5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxjGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+  <deploymentContexts id="_bRcz5zGXEeiZvO179UG_dA" name="Persistence5 --> C44">
+    <assemblyContext href="petsupplystore.system#_bnysxzGWEeiZvO179UG_dA"/>
+    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="petsupplystore.resourcelandscape#_EbzJ456vEeenbagyTTgVyA"/>
+  </deploymentContexts>
+</deployment:Deployment>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.repository b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.repository
similarity index 67%
rename from dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.repository
rename to dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.repository
index cdf3f05af93f59bf6a84f7c4a2e46c525cc6256d..63955144fc9c2afc2dc5ef106778b961e77f6f2e 100644
--- a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/petsupplystore.repository
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.repository
@@ -1,110 +1,88 @@
-<?xml version="1.0" encoding="ASCII"?>
-<repository:Repository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:resourcetype="http://www.descartes.tools/metamodel/resourcetype/1.0" xmlns:servicebehavior="http://www.descartes.tools/metamodel/servicebehavior/1.0" id="_O2wgMEcEEeOgk9V4uRCQAw" name="repositoryName">
-  <imports importURI="min.resourcetype"/>
-  <interfaces id="_Tq2AUUhvEeOHzfCev3b1wQ" name="IWebUI">
-    <signatures id="_aeA_cEh-EeOdTtmYhYAY2w" name="addItemToCart"/>
-  </interfaces>
-  <interfaces id="_UFFL4p6vEeenbagyTTgVyA" name="IStore">
-    <signatures id="_UFFL456vEeenbagyTTgVyA" name="addItemToCart"/>
-  </interfaces>
-  <interfaces id="_U7daQp6vEeenbagyTTgVyA" name="IImage">
-    <signatures id="_U7daQ56vEeenbagyTTgVyA" name="addItemToCart"/>
-  </interfaces>
-  <interfaces id="_VAlK0J6vEeenbagyTTgVyA" name="IRecommender">
-    <signatures id="_VAlK0Z6vEeenbagyTTgVyA" name="addItemToCart"/>
-  </interfaces>
-  <interfaces id="_VK5kcp6vEeenbagyTTgVyA" name="IPersistence">
-    <signatures id="_VK5kc56vEeenbagyTTgVyA" name="addItemToCart"/>
-  </interfaces>
-  <components xsi:type="repository:BasicComponent" id="_ePxeNEicEeOUHduTkzq26A" name="WebUi">
-    <interfaceProvidingRoles id="_fMTX4EicEeOUHduTkzq26A" name="IWebUI" interface="_Tq2AUUhvEeOHzfCev3b1wQ"/>
-    <interfaceRequiringRoles id="_AFUcYZ6wEeenbagyTTgVyA" name="IStore" interface="_UFFL4p6vEeenbagyTTgVyA"/>
-    <interfaceRequiringRoles id="_AmTpkZ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
-    <fineGrainedBehavior describedSignature="_aeA_cEh-EeOdTtmYhYAY2w" interfaceProvidingRole="_fMTX4EicEeOUHduTkzq26A">
-      <behavior>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_7HKD0J6wEeenbagyTTgVyA" name="IStore" signature="_UFFL456vEeenbagyTTgVyA" interfaceRequiringRole="_AFUcYZ6wEeenbagyTTgVyA"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="12341235124145" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.005289947"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_-sZsMJ6wEeenbagyTTgVyA" name="IImage" signature="_U7daQ56vEeenbagyTTgVyA" interfaceRequiringRole="_AmTpkZ6wEeenbagyTTgVyA"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_H_1b5J6wEeenbagyTTgVyA" name="Store">
-    <interfaceProvidingRoles id="_H_1b556wEeenbagyTTgVyA" name="IStore" interface="_UFFL4p6vEeenbagyTTgVyA"/>
-    <interfaceRequiringRoles id="_H_1b5p6wEeenbagyTTgVyA" name="IRecommender" interface="_VAlK0J6vEeenbagyTTgVyA"/>
-    <interfaceRequiringRoles id="_H_1b5Z6wEeenbagyTTgVyA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
-    <fineGrainedBehavior describedSignature="_UFFL456vEeenbagyTTgVyA" interfaceProvidingRole="_H_1b556wEeenbagyTTgVyA">
-      <behavior>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_HgTx0J6xEeenbagyTTgVyA" name="IPersistence" signature="_VK5kc56vEeenbagyTTgVyA" interfaceRequiringRole="_H_1b5Z6wEeenbagyTTgVyA"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="12341235124146" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.012421232"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_J6Iv8J6xEeenbagyTTgVyA" name="IRecommender" signature="_VAlK0Z6vEeenbagyTTgVyA" interfaceRequiringRole="_H_1b5p6wEeenbagyTTgVyA"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_TCROlJ6wEeenbagyTTgVyA" name="Image">
-    <interfaceProvidingRoles id="_TCR1oJ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
-    <fineGrainedBehavior describedSignature="_U7daQ56vEeenbagyTTgVyA" interfaceProvidingRole="_TCR1oJ6wEeenbagyTTgVyA">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="12341235124147" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.001379606"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_eviG8p6wEeenbagyTTgVyA" name="Recommender">
-    <interfaceProvidingRoles id="_eviG856wEeenbagyTTgVyA" name="IRecommender" interface="_VAlK0J6vEeenbagyTTgVyA"/>
-    <fineGrainedBehavior describedSignature="_VAlK0Z6vEeenbagyTTgVyA" interfaceProvidingRole="_eviG856wEeenbagyTTgVyA">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="12341235124148" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.000670661"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_mBAwgp6wEeenbagyTTgVyA" name="Persistence">
-    <interfaceProvidingRoles id="_mBAwg56wEeenbagyTTgVyA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
-    <fineGrainedBehavior describedSignature="_VK5kc56vEeenbagyTTgVyA" interfaceProvidingRole="_mBAwg56wEeenbagyTTgVyA">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="12341235124149" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.006783267"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-</repository:Repository>
+<?xml version="1.0" encoding="ASCII"?>
+<repository:Repository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:resourcetype="http://www.descartes.tools/metamodel/resourcetype/1.0" xmlns:servicebehavior="http://www.descartes.tools/metamodel/servicebehavior/1.0" id="_O2wgMEcEEeOgk9V4uRCQAw" name="repositoryName">
+  <imports importURI="min.resourcetype"/>
+  <interfaces id="_Tq2AUUhvEeOHzfCev3b1wQ" name="IWebUI">
+    <signatures id="_aeA_cEh-EeOdTtmYhYAY2w" name="categoryView"/>
+  </interfaces>
+  <interfaces id="_UFFL4p6vEeenbagyTTgVyA" name="IAuth">
+    <signatures id="_UFFL456vEeenbagyTTgVyA" name="categoryView"/>
+  </interfaces>
+  <interfaces id="_U7daQp6vEeenbagyTTgVyA" name="IImage">
+    <signatures id="_U7daQ56vEeenbagyTTgVyA" name="categoryView"/>
+  </interfaces>
+  <interfaces id="_VK5kcp6vEeenbagyTTgVyA" name="IPersistence">
+    <signatures id="_VK5kc56vEeenbagyTTgVyA" name="categoryView"/>
+  </interfaces>
+  <components xsi:type="repository:BasicComponent" id="_ePxeNEicEeOUHduTkzq26A" name="WebUi">
+    <interfaceProvidingRoles id="_fMTX4EicEeOUHduTkzq26A" name="IWebUI" interface="_Tq2AUUhvEeOHzfCev3b1wQ"/>
+    <interfaceRequiringRoles id="_AFUcYZ6wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_AmTpkZ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <interfaceRequiringRoles id="_rvGZcTGUEeiZvO179UG_dA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_aeA_cEh-EeOdTtmYhYAY2w" interfaceProvidingRole="_fMTX4EicEeOUHduTkzq26A">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124145" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.004268941"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_7HKD0J6wEeenbagyTTgVyA" name="IAuth" signature="_UFFL456vEeenbagyTTgVyA" interfaceRequiringRole="_AFUcYZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_-sZsMJ6wEeenbagyTTgVyA" name="IImage" signature="_U7daQ56vEeenbagyTTgVyA" interfaceRequiringRole="_AmTpkZ6wEeenbagyTTgVyA"/>
+        </actions>
+        <actions xsi:type="servicebehavior:ExternalCallAction">
+          <externalCall id="_oC7CoDGUEeiZvO179UG_dA" name="IPersistence" signature="_VK5kc56vEeenbagyTTgVyA" interfaceRequiringRole="_rvGZcTGUEeiZvO179UG_dA"/>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_H_1b5J6wEeenbagyTTgVyA" name="Auth">
+    <interfaceProvidingRoles id="_H_1b556wEeenbagyTTgVyA" name="IAuth" interface="_UFFL4p6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_UFFL456vEeenbagyTTgVyA" interfaceProvidingRole="_H_1b556wEeenbagyTTgVyA">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124146" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.000501859"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_TCROlJ6wEeenbagyTTgVyA" name="Image">
+    <interfaceProvidingRoles id="_TCR1oJ6wEeenbagyTTgVyA" name="IImage" interface="_U7daQp6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_U7daQ56vEeenbagyTTgVyA" interfaceProvidingRole="_TCR1oJ6wEeenbagyTTgVyA">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124147" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.001749753"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+  <components xsi:type="repository:BasicComponent" id="_mBAwgp6wEeenbagyTTgVyA" name="Persistence">
+    <interfaceProvidingRoles id="_mBAwg56wEeenbagyTTgVyA" name="IPersistence" interface="_VK5kcp6vEeenbagyTTgVyA"/>
+    <fineGrainedBehavior describedSignature="_VK5kc56vEeenbagyTTgVyA" interfaceProvidingRole="_mBAwg56wEeenbagyTTgVyA">
+      <behavior>
+        <actions xsi:type="servicebehavior:InternalAction">
+          <resourceDemand id="12341235124149" characterization="EXPLICIT">
+            <explicitDescription>
+              <probFunction xsi:type="functions:DoubleLiteral" value="0.002398622"/>
+            </explicitDescription>
+            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+          </resourceDemand>
+        </actions>
+      </behavior>
+    </fineGrainedBehavior>
+  </components>
+</repository:Repository>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.resourcelandscape b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.resourcelandscape
new file mode 100644
index 0000000000000000000000000000000000000000..f5628167dbd1b423c212924a7603fc5752787e16
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.resourcelandscape
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
+  <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
+    <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="C16">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_DSaf8J6vEeenbagyTTgVyA" name="C34">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_DSaf8Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_DSaf8p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EDFH4J6vEeenbagyTTgVyA" name="C37">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EDFH4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EDFH4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EJLv4J6vEeenbagyTTgVyA" name="C38">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EJLv4Z6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EJLv4p6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+    <computeNodes id="_EbzJ456vEeenbagyTTgVyA" name="C44">
+      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_EbzJ5J6vEeenbagyTTgVyA" name="CPU" schedulingPolicy="FCFS">
+        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+        <nrOfParProcUnits id="_EbzJ5Z6vEeenbagyTTgVyA" name="cores" number="16"/>
+      </configSpec>
+    </computeNodes>
+  </consistsOf>
+</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.system b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.system
new file mode 100644
index 0000000000000000000000000000000000000000..216f12c9e779ed8d70112c06db901632562a50e7
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.system
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="ASCII"?>
+<system:System xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:repository="http://www.descartes.tools/metamodel/repository/1.0" xmlns:system="http://www.descartes.tools/metamodel/system/1.0" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys">
+  <assemblyContexts id="_5QiUIEeoEeSW4Op0B0CyhQ" name="WebUi">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bfzh8Z64EeenbagyTTgVyA" name="Auth">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bm1-EZ64EeenbagyTTgVyA" name="Image">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_b7h0oZ64EeenbagyTTgVyA" name="Persistence">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_iki7wJ7TEeeYgrrytYLG1g" name="WebUi2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYJ7TEeeYgrrytYLG1g" name="Auth2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikpCYZ7TEeeYgrrytYLG1g" name="Image2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_ikppcJ7TEeeYgrrytYLG1g" name="Persistence2">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygDGVEeiZvO179UG_dA" name="WebUi3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygTGVEeiZvO179UG_dA" name="Auth3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygjGVEeiZvO179UG_dA" name="Image3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_vOQygzGVEeiZvO179UG_dA" name="Persistence3">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1DGWEeiZvO179UG_dA" name="WebUi4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1TGWEeiZvO179UG_dA" name="Auth4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1jGWEeiZvO179UG_dA" name="Image4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_MBHS1zGWEeiZvO179UG_dA" name="Persistence4">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxDGWEeiZvO179UG_dA" name="WebUi5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_ePxeNEicEeOUHduTkzq26A"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxTGWEeiZvO179UG_dA" name="Auth5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_H_1b5J6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxjGWEeiZvO179UG_dA" name="Image5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_TCROlJ6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyContexts id="_bnysxzGWEeiZvO179UG_dA" name="Persistence5">
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="petsupplystore.repository#_mBAwgp6wEeenbagyTTgVyA"/>
+  </assemblyContexts>
+  <assemblyConnectors id="_p6hfEZ64EeenbagyTTgVyA" name="WebUi --> Auth" providingAssemblyContext="_bfzh8Z64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_qwnZkZ64EeenbagyTTgVyA" name="WebUi --> Image" providingAssemblyContext="_bm1-EZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_q32C8Z64EeenbagyTTgVyA" name="WebUi --> Persistence" providingAssemblyContext="_b7h0oZ64EeenbagyTTgVyA" requiringAssemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6Np7TEeeYgrrytYLG1g" name="WebUi2 --> Persistence2" providingAssemblyContext="_ikppcJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NJ7TEeeYgrrytYLG1g" name="WebUi2 --> Auth2" providingAssemblyContext="_ikpCYJ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_nJH6NZ7TEeeYgrrytYLG1g" name="WebUi2 --> Image2" providingAssemblyContext="_ikpCYZ7TEeeYgrrytYLG1g" requiringAssemblyContext="_iki7wJ7TEeeYgrrytYLG1g">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hwzGVEeiZvO179UG_dA" name="WebUi3 --> Auth3" providingAssemblyContext="_vOQygTGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxDGVEeiZvO179UG_dA" name="WebUi3 --> Image3" providingAssemblyContext="_vOQygjGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_zp9hxTGVEeiZvO179UG_dA" name="WebUi3 --> Persistence3" providingAssemblyContext="_vOQygzGVEeiZvO179UG_dA" requiringAssemblyContext="_vOQygDGVEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76szGWEeiZvO179UG_dA" name="WebUi4 --> Auth4" providingAssemblyContext="_MBHS1TGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tDGWEeiZvO179UG_dA" name="WebUi4 --> Image4" providingAssemblyContext="_MBHS1jGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_OW76tTGWEeiZvO179UG_dA" name="WebUi4 --> Persistence4" providingAssemblyContext="_MBHS1zGWEeiZvO179UG_dA" requiringAssemblyContext="_MBHS1DGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7QzGWEeiZvO179UG_dA" name="WebUi5 --> Auth5" providingAssemblyContext="_bnysxTGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AFUcYZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_H_1b556wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RDGWEeiZvO179UG_dA" name="WebUi5 --> Image5" providingAssemblyContext="_bnysxjGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_AmTpkZ6wEeenbagyTTgVyA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_TCR1oJ6wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <assemblyConnectors id="_eza7RTGWEeiZvO179UG_dA" name="WebUi5 --> Persistence5" providingAssemblyContext="_bnysxzGWEeiZvO179UG_dA" requiringAssemblyContext="_bnysxDGWEeiZvO179UG_dA">
+    <interfaceRequiringRole href="petsupplystore.repository#_rvGZcTGUEeiZvO179UG_dA"/>
+    <interfaceProvidingRole href="petsupplystore.repository#_mBAwg56wEeenbagyTTgVyA"/>
+  </assemblyConnectors>
+  <providingDelegationConnectors id="_6lWyAEeoEeSW4Op0B0CyhQ" name="OuterWebUiToInnerWebUi" assemblyContext="_5QiUIEeoEeSW4Op0B0CyhQ" outerInterfaceProvidingRole="_zdRVAUeoEeSW4Op0B0CyhQ">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_4v0EEp7TEeeYgrrytYLG1g" name="OuterWebUi2ToInnerWebUi2" assemblyContext="_iki7wJ7TEeeYgrrytYLG1g" outerInterfaceProvidingRole="_1kuBFJ7TEeeYgrrytYLG1g">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_CFbFwTGWEeiZvO179UG_dA" name="OuterWebUi3ToInnerWebUi3" assemblyContext="_vOQygDGVEeiZvO179UG_dA" outerInterfaceProvidingRole="_A2yIYTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_XUpckTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi4" assemblyContext="_MBHS1DGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_WJAv4TGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <providingDelegationConnectors id="_m3s6wTGWEeiZvO179UG_dA" name="OuterWebUi4ToInnerWebUi5" assemblyContext="_bnysxDGWEeiZvO179UG_dA" outerInterfaceProvidingRole="_lB52wTGWEeiZvO179UG_dA">
+    <innerInterfaceProvidingRole href="petsupplystore.repository#_fMTX4EicEeOUHduTkzq26A"/>
+  </providingDelegationConnectors>
+  <interfaceProvidingRoles id="_zdRVAUeoEeSW4Op0B0CyhQ" name="IWebUi">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_1kuBFJ7TEeeYgrrytYLG1g" name="IWebUI2">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_A2yIYTGWEeiZvO179UG_dA" name="IWebUI3">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_WJAv4TGWEeiZvO179UG_dA" name="IWebUI4">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+  <interfaceProvidingRoles id="_lB52wTGWEeiZvO179UG_dA" name="IWebUI5">
+    <interface href="petsupplystore.repository#_Tq2AUUhvEeOHzfCev3b1wQ"/>
+  </interfaceProvidingRoles>
+</system:System>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.usageprofile b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.usageprofile
new file mode 100644
index 0000000000000000000000000000000000000000..b9b77183404ad3ae2b83909dfe27e69e2d88d055
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DML-Model/static/petsupplystore.usageprofile
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ASCII"?>
+<usageprofile:UsageProfile xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0" xmlns:usageprofile="http://www.descartes.tools/metamodel/usageprofile/1.0" id="_yiEmIEeqEeSW4Op0B0CyhQ" name="200">
+  <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
+  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="Scenario_addItemToCart">
+    <scenarioBehavior>
+      <actions xsi:type="usageprofile:BranchUserAction">
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ALS-MZ7UEeeYgrrytYLG1g" name="Call_addItemToCart">
+            <providingRole href="petsupplystore.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ASOsoZ7UEeeYgrrytYLG1g" name="Call2_addItemToCart">
+            <providingRole href="petsupplystore.system#_1kuBFJ7TEeeYgrrytYLG1g"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nUiyUTGXEeiZvO179UG_dA" name="Call3_addItemToCart">
+            <providingRole href="petsupplystore.system#_A2yIYTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_nlibsTGXEeiZvO179UG_dA" name="Call4_addItemToCart">
+            <providingRole href="petsupplystore.system#_WJAv4TGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+          </actions>
+        </branches>
+        <branches>
+          <actions xsi:type="usageprofile:SystemCallUserAction" id="_ntxxsTGXEeiZvO179UG_dA" name="Call5_addItemToCart">
+            <providingRole href="petsupplystore.system#_lB52wTGWEeiZvO179UG_dA"/>
+            <signature href="petsupplystore.repository#_aeA_cEh-EeOdTtmYhYAY2w"/>
+          </actions>
+        </branches>
+        <branchingProbabilities>
+          <probFunction xsi:type="functions:ProbabilityMassFunction">
+            <samples xsi:type="functions:EnumSampleList">
+              <items value="Branch1" probability="0.2"/>
+              <items value="Branch2" probability="0.2"/>
+              <items value="Branch3" probability="0.2"/>
+              <items value="Branch4" probability="0.2"/>
+              <items value="Branch5" probability="0.2"/>
+            </samples>
+          </probFunction>
+        </branchingProbabilities>
+      </actions>
+    </scenarioBehavior>
+    <workloadType xsi:type="usageprofile:OpenWorkloadType">
+      <interArrivalTime>
+        <probFunction xsi:type="functions:ExponentialDistribution" rate="1000"/>
+      </interArrivalTime>
+    </workloadType>
+  </usageScenarios>
+</usageprofile:UsageProfile>
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysisComparison_4stacks.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysisComparison_4stacks.dql
deleted file mode 100644
index 2a0bc447c4111a5c7e0f6999e62241754ac06d99..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysisComparison_4stacks.dql
+++ /dev/null
@@ -1,15 +0,0 @@
-SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, Scenario_addItemToCart.avgResponseTime, Scenario_addItemToCart.throughput
-EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <200,400,600,800,1000>
-FOR	SERVICE	'_ASOsoZ7UEeeYgrrytYLG1g'	AS	Call2_addItemToCart,
-	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	Scenario_addItemToCart,
-	SERVICE	'_ALS-MZ7UEeeYgrrytYLG1g'	AS	Call_addItemToCart,
-	SERVICE	'_7HKD0J6wEeenbagyTTgVyA'	AS	IStore,
-	SERVICE	'_-sZsMJ6wEeenbagyTTgVyA'	AS	IImage,
-	SERVICE	'_J6Iv8J6xEeenbagyTTgVyA'	AS	IRecommender,
-	SERVICE	'_HgTx0J6xEeenbagyTTgVyA'	AS	IPersistence,
-	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
-	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
-	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
-	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
-USING dml@'petsupplystore_4stacks.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysis_4stacks.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysis_4stacks.dql
deleted file mode 100644
index fa860a95d49c73002a6ec7ff9d0ea57b7e1558ef..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/BoundsAnalysis_4stacks.dql
+++ /dev/null
@@ -1,16 +0,0 @@
-SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, Scenario_addItemToCart.avgResponseTime, Scenario_addItemToCart.throughput
-CONSTRAINED AS 'BOUNDS'
-EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <200,400,600,800,1000>
-FOR	SERVICE	'_ASOsoZ7UEeeYgrrytYLG1g'	AS	Call2_addItemToCart,
-	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	Scenario_addItemToCart,
-	SERVICE	'_ALS-MZ7UEeeYgrrytYLG1g'	AS	Call_addItemToCart,
-	SERVICE	'_7HKD0J6wEeenbagyTTgVyA'	AS	IStore,
-	SERVICE	'_-sZsMJ6wEeenbagyTTgVyA'	AS	IImage,
-	SERVICE	'_J6Iv8J6xEeenbagyTTgVyA'	AS	IRecommender,
-	SERVICE	'_HgTx0J6xEeenbagyTTgVyA'	AS	IPersistence,
-	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
-	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
-	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
-	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
-USING dml@'petsupplystore_4stacks.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/DMLSelectMetrics.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/DMLSelectMetrics.dql
deleted file mode 100644
index 9d4e4dc135ab329f416f31b617a1fb6379db8871..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/DMLSelectMetrics.dql
+++ /dev/null
@@ -1,16 +0,0 @@
-SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, IRecommender.avgResponseTime
-//SELECT	C37_CPU.utilization, C38_CPU.utilization, C34_CPU.utilization,C44_CPU.utilization,C16_CPU.utilization,IRecommender.avgResponseTime
-EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <200,400,600,800,1000>
-FOR	SERVICE	'_ASOsoZ7UEeeYgrrytYLG1g'	AS	Call2_addItemToCart,
-	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	Scenario_addItemToCart,
-	SERVICE	'_ALS-MZ7UEeeYgrrytYLG1g'	AS	Call_addItemToCart,
-	SERVICE	'_7HKD0J6wEeenbagyTTgVyA'	AS	IStore,
-	SERVICE	'_-sZsMJ6wEeenbagyTTgVyA'	AS	IImage,
-	SERVICE	'_J6Iv8J6xEeenbagyTTgVyA'	AS	IRecommender,
-	SERVICE	'_HgTx0J6xEeenbagyTTgVyA'	AS	IPersistence,
-	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
-	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
-	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
-	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
-USING dml@'petsupplystore_4stacks.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Large.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Large.dql
new file mode 100644
index 0000000000000000000000000000000000000000..6bc5e5df3c93f751b6b04b611b07d9aefcb73201
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Large.dql
@@ -0,0 +1,8 @@
+SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, C44_CPU.utilization
+EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <1000, 2000, 3000, 4000, 5000>
+FOR	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
+	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
+	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
+	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
+USING dml@'petsupplystore-parametric-large.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Small.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Small.dql
new file mode 100644
index 0000000000000000000000000000000000000000..4ad26f33db11f558d31a984287f7ee3c600dabc7
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Parameteric_Small.dql
@@ -0,0 +1,8 @@
+SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, C44_CPU.utilization
+EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <1000, 2000, 3000, 4000, 5000>
+FOR	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
+	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
+	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
+	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
+USING dml@'petsupplystore-parametric-small.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Static.dql b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Static.dql
new file mode 100644
index 0000000000000000000000000000000000000000..be79875cb7905dd933bbf901927ad9221ede515b
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/PaperMetric_Static.dql
@@ -0,0 +1,8 @@
+SELECT	C37_CPU.utilization, C38_CPU.utilization, C16_CPU.utilization, C34_CPU.utilization, C44_CPU.utilization
+EVALUATE DOF VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' AS Load <1000, 2000, 3000, 4000, 5000>
+FOR	RESOURCE	'_EbzJ5J6vEeenbagyTTgVyA'	AS	C44_CPU,
+	RESOURCE	'_EJLv4Z6vEeenbagyTTgVyA'	AS	C38_CPU,
+	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	C16_CPU,
+	RESOURCE	'_EDFH4Z6vEeenbagyTTgVyA'	AS	C37_CPU,
+	RESOURCE	'_DSaf8Z6vEeenbagyTTgVyA'	AS	C34_CPU
+USING dml@'petsupplystore-static.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-large.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-large.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b0cffb03b35d4393d0c0572eb318187fd7e6ad15
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-large.properties
@@ -0,0 +1,8 @@
+## Model Instance
+dml.files.usageprofile=/../DML-Model/parameteric-large/petsupplystore.usageprofile
+dml.files.deployment=/../DML-Model/parameteric-large/petsupplystore.deployment
+dml.files.system=/../DML-Model/parameteric-large/petsupplystore.system
+dml.files.repository=/../DML-Model/parameteric-large/petsupplystore.repository
+dml.files.resourcelandscape=/../DML-Model/parameteric-large/petsupplystore.resourcelandscape
+simqpn.totalRunLength = 10000
+#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-small.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-small.properties
new file mode 100644
index 0000000000000000000000000000000000000000..cdb6f712b614ba8cdd989c11b38b3b2aa4c10c20
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-parametric-small.properties
@@ -0,0 +1,8 @@
+## Model Instance
+dml.files.usageprofile=/../DML-Model/parameteric-small/petsupplystore.usageprofile
+dml.files.deployment=/../DML-Model/parameteric-small/petsupplystore.deployment
+dml.files.system=/../DML-Model/parameteric-small/petsupplystore.system
+dml.files.repository=/../DML-Model/parameteric-small/petsupplystore.repository
+dml.files.resourcelandscape=/../DML-Model/parameteric-small/petsupplystore.resourcelandscape
+simqpn.totalRunLength = 10000
+#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-static.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-static.properties
new file mode 100644
index 0000000000000000000000000000000000000000..05de21f638487cfe140930c7a2c77bac4ec22e7c
--- /dev/null
+++ b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore-static.properties
@@ -0,0 +1,8 @@
+## Model Instance
+dml.files.usageprofile=/../DML-Model/static/petsupplystore.usageprofile
+dml.files.deployment=/../DML-Model/static/petsupplystore.deployment
+dml.files.system=/../DML-Model/static/petsupplystore.system
+dml.files.repository=/../DML-Model/static/petsupplystore.repository
+dml.files.resourcelandscape=/../DML-Model/static/petsupplystore.resourcelandscape
+simqpn.totalRunLength = 10000
+#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_2stacks.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_2stacks.properties
deleted file mode 100644
index 05effde83d6e0829aa32faaaecd83d87113ad458..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_2stacks.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/petsupplystore_2stacks.usageprofile
-dml.files.deployment=/../DML-Model/petsupplystore_2stacks.deployment
-dml.files.system=/../DML-Model/petsupplystore_2stacks.system
-dml.files.repository=/../DML-Model/petsupplystore.repository
-dml.files.resourcelandscape=/../DML-Model/petsupplystore.resourcelandscape
-simqpn.totalRunLength=1000
-#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_4stacks.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_4stacks.properties
deleted file mode 100644
index 7767aa24566044e5f41efa16b245f1941281726d..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_4stacks.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/petsupplystore_4stacks.usageprofile
-dml.files.deployment=/../DML-Model/petsupplystore_4stacks.deployment
-dml.files.system=/../DML-Model/petsupplystore_4stacks.system
-dml.files.repository=/../DML-Model/petsupplystore.repository
-dml.files.resourcelandscape=/../DML-Model/petsupplystore.resourcelandscape
-simqpn.totalRunLength=1000
-#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_distributed.properties b/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_distributed.properties
deleted file mode 100644
index b7efaeacb6208a257c9edeb35d77527003446c72..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore-Toolpaper/DQL-Queries/petsupplystore_distributed.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/petsupplystore_distributed.usageprofile
-dml.files.deployment=/../DML-Model/petsupplystore_distributed.deployment
-simqpn.totalRunLength=1000
-#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/Simple.functions b/dml-examples/Simple.functions
deleted file mode 100644
index b2ae3c027fcf96af938b64a3d33dcda8621bae8f..0000000000000000000000000000000000000000
--- a/dml-examples/Simple.functions
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<functions:RandomVariable xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:functions="http://www.descartes.tools/metamodel/functions/1.0">
-  <probFunction xsi:type="functions:BoxedPDF">
-    <sample value="1" probability="0"/>
-    <sample value="2" probability="0.3"/>
-    <sample value="5" probability="0.6"/>
-  </probFunction>
-</functions:RandomVariable>