diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.deployment b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.deployment
deleted file mode 100644
index 151b47197df5d4fb1a1b3f65915ae2541cd95968..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.deployment
+++ /dev/null
@@ -1,33 +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="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="min.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_cpot0O2fEeib_P5jAe7dPw" name="A --> CPA">
-    <assemblyContext href="min.system#A"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_c_BH8e2fEeib_P5jAe7dPw" name="B --> CPB">
-    <assemblyContext href="min.system#B"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_We1_g-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dD0vce2fEeib_P5jAe7dPw" name="C --> CPC">
-    <assemblyContext href="min.system#C"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_WjRMg-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dJi88e2fEeib_P5jAe7dPw" name="D --> CPD">
-    <assemblyContext href="min.system#D"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_Wr9Oc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dT7A8e2fEeib_P5jAe7dPw" name="E --> CPE">
-    <assemblyContext href="min.system#E"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W2Lhc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dcUH8e2fEeib_P5jAe7dPw" name="F --> CPF">
-    <assemblyContext href="min.system#F"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W9C-c-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_othWce2fEeib_P5jAe7dPw" name="G --> CPG">
-    <assemblyContext href="min.system#G"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_XFIjc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.repository b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.repository
deleted file mode 100644
index a35015d256e53ec81721c6104726640a5e51b8c7..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.repository
+++ /dev/null
@@ -1,237 +0,0 @@
-<?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">
-  <interfaces id="_uqNJk-2aEeib_P5jAe7dPw" name="A">
-    <signatures id="_vzGrUO2aEeib_P5jAe7dPw" name="A"/>
-  </interfaces>
-  <interfaces id="_xapQ4O2aEeib_P5jAe7dPw" name="B">
-    <signatures id="_xapQ4e2aEeib_P5jAe7dPw" name="B"/>
-  </interfaces>
-  <interfaces id="_xf4WMu2aEeib_P5jAe7dPw" name="C">
-    <signatures id="_xf4WM-2aEeib_P5jAe7dPw" name="C"/>
-  </interfaces>
-  <interfaces id="_I6TZQu2bEeib_P5jAe7dPw" name="D">
-    <signatures id="_I6TZQ-2bEeib_P5jAe7dPw" name="D"/>
-  </interfaces>
-  <interfaces id="_JCed0e2bEeib_P5jAe7dPw" name="E">
-    <signatures id="_JCed0u2bEeib_P5jAe7dPw" name="E"/>
-  </interfaces>
-  <interfaces id="_JTZ1wu2bEeib_P5jAe7dPw" name="F">
-    <signatures id="_JTZ1w-2bEeib_P5jAe7dPw" name="F"/>
-  </interfaces>
-  <interfaces id="_JqhVQu2bEeib_P5jAe7dPw" name="G">
-    <signatures id="_JqhVQ-2bEeib_P5jAe7dPw" name="G"/>
-  </interfaces>
-  <components xsi:type="repository:BasicComponent" id="_Q2VbtO2bEeib_P5jAe7dPw" name="A">
-    <interfaceProvidingRoles id="_SHb3MO2bEeib_P5jAe7dPw" name="A" interface="_uqNJk-2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_S0bgEe2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_vzGrUO2aEeib_P5jAe7dPw" interfaceProvidingRole="_SHb3MO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Z0axAO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.05"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_jPXogO2bEeib_P5jAe7dPw" name="ToB" signature="_xapQ4e2aEeib_P5jAe7dPw" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_pR8ecPMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_ng-npO2bEeib_P5jAe7dPw" name="B">
-    <interfaceProvidingRoles id="_oTaxMO2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_o-tJ4e2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_pW0u8e2bEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xapQ4e2aEeib_P5jAe7dPw" interfaceProvidingRole="_oTaxMO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_wQn4UO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_1XjV4O2bEeib_P5jAe7dPw" name="ToC" signature="_xf4WM-2aEeib_P5jAe7dPw" interfaceRequiringRole="_o-tJ4e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_3Nfj0O2bEeib_P5jAe7dPw" name="ToE" signature="_JCed0u2bEeib_P5jAe7dPw" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_-H9EAfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_5tliBO2bEeib_P5jAe7dPw" name="C">
-    <interfaceProvidingRoles id="_7gZjcO2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_674hIe2bEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xf4WM-2aEeib_P5jAe7dPw" interfaceProvidingRole="_7gZjcO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CXbssO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:LoopAction">
-          <loopBodyBehavior>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_W7bVMO2cEeib_P5jAe7dPw" name="ToD" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
-            </actions>
-          </loopBodyBehavior>
-          <loopIterationCount id="_HkxUQO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:IntLiteral" value="5"/>
-            </explicitDescription>
-          </loopIterationCount>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="__bzRgfMLEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_szxFBO2dEeib_P5jAe7dPw" name="D">
-    <interfaceProvidingRoles id="_uP8vIO2dEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_uP8vIO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_zA8Y8O2dEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_ADsX8fMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_59cRBO2dEeib_P5jAe7dPw" name="E">
-    <interfaceProvidingRoles id="_6wgFoO2dEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7K9NAe2dEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7nafge2dEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JCed0u2bEeib_P5jAe7dPw" interfaceProvidingRole="_6wgFoO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Df43oO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.2"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_NSR-wO2eEeib_P5jAe7dPw" name="ToF" signature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7K9NAe2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_PVKcgO2eEeib_P5jAe7dPw" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_BLBzcfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_RZ57dO2eEeib_P5jAe7dPw" name="F">
-    <interfaceProvidingRoles id="_S_LQIO2eEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceProvidingRole="_S_LQIO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:BranchAction">
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_cG0KEO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_gSfgUe2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="100"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branchProbabilities id="_XbBJUO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.8"/>
-            </explicitDescription>
-          </branchProbabilities>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CE2-cfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_R1LiNO2eEeib_P5jAe7dPw" name="G">
-    <interfaceProvidingRoles id="_TRbdwO2eEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_TRbdwO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_mprE0O2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.03333333333"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_DWdJMfMMEeiRdfQDBIGrTA" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="3"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-</repository:Repository>
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.resourcelandscape b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.resourcelandscape
deleted file mode 100644
index 855377e342e9bda7937f579a1d5d4cdd1e3ad541..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.resourcelandscape
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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="CPA">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_yS7WwfMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_0rctUPMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_We1_g-2fEeib_P5jAe7dPw" name="CPB">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_We1_hO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_We1_he2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6JPywPMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6JPywfMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_WjRMg-2fEeib_P5jAe7dPw" name="CPC">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_WjRMhO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_WjRMhe2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6aFrIvMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6aFrI_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_Wr9Oc-2fEeib_P5jAe7dPw" name="CPD">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_Wr9OdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_Wr9Ode2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6uWD4vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6uWD4_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W2Lhc-2fEeib_P5jAe7dPw" name="CPE">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W2LhdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W2Lhde2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7J0e8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7J0e8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W9C-c-2fEeib_P5jAe7dPw" name="CPF">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W9C-dO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W9C-de2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7nRP8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7nRP8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_XFIjc-2fEeib_P5jAe7dPw" name="CPG">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_XFIjdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_XFIjde2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8FUd4vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_8FUd4_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-  </consistsOf>
-</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system
deleted file mode 100644
index 98f3f943cd963c154fa01e5a47f175bb953d5fba..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="A" name="A">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\A_RandomForest.model">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_ng-npO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\B_RandomForest.model">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_5tliBO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\C_RandomForest.model">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_szxFBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\D_RandomForest.model">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_59cRBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\E_RandomForest.model">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_RZ57dO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\F_RandomForest.model">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_R1LiNO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="D:\Dokumente\hiwi-daten\data\syncomp_swc_raw\G_RandomForest.model">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --> B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --> C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --> D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --> E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --> F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --> G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_7NJv8u2eEeib_P5jAe7dPw" name="A --> A" assemblyContext="A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system.bak b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system.bak
deleted file mode 100644
index 3cdb13a02436942b69798895c41abd40aa854575..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.system.bak
+++ /dev/null
@@ -1,165 +0,0 @@
-<system:System xmlns:system="http://www.descartes.tools/metamodel/system/1.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys" xmi:version="2.0">
-  <assemblyContexts id="A" name="A">
-    <encapsulatedComponent href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="262.84963425757894" xsi:type="system:Constant" /><basisFunctions coefficient="25.1950842561908" knot="9" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.976227106218841" knot="9" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-18.661905059764372" knot="107" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent href="min.repository#_ng-npO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="232.2645484858773" xsi:type="system:Constant" /><basisFunctions coefficient="25.52707636070293" knot="8" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.8673196423639755" knot="8" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.4301195149020542" knot="58" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent href="min.repository#_5tliBO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="111.82389647914309" xsi:type="system:Constant" /><basisFunctions coefficient="26.158780903204537" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.269589171172274" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.5943941620931752" knot="37" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent href="min.repository#_szxFBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="1777.895105277294" xsi:type="system:Constant" /><basisFunctions coefficient="-12.048274165389246" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="13.624554538340941" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-17.19997044564344" knot="106" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent href="min.repository#_59cRBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="80.694074311176" xsi:type="system:Constant" /><basisFunctions coefficient="12.175649652283221" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-2.6639153640224316" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-14.347524289871105" knot="18" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent href="min.repository#_RZ57dO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="196540843982208.88" xsi:type="system:Constant" /><basisFunctions coefficient="-39308168796415.17" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796422.97" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796428.94" knot="7" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-39308168796432.36" knot="7" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent href="min.repository#_R1LiNO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="41.50498064823611" xsi:type="system:Constant" /><basisFunctions coefficient="11.831802896944605" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.973996639715038" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --&gt; B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --&gt; C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --&gt; D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --&gt; E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --&gt; F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --&gt; G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <providingDelegationConnectors assemblyContext="A" id="_7NJv8u2eEeib_P5jAe7dPw" name="A --&gt; A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw" />
-  </interfaceProvidingRoles>
-</system:System>
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.usageprofile b/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.usageprofile
deleted file mode 100644
index 1b2f4a29ad6005566ac8d3518eeca8cb266d3386..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DML-Model/min.usageprofile
+++ /dev/null
@@ -1,19 +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="usgProfile">
-  <imports importURI="min.system"/>
-  <imports importURI="min.repository"/>
-  <system href="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="usagescenario">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="usageToA">
-        <providingRole href="min.system#_43ITxO2eEeib_P5jAe7dPw"/>
-        <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="0.005"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis.dql
deleted file mode 100644
index 05e052d390a05f02ea4b33efae9869e4c9b3ecf3..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime, usageToA.throughput
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_A.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_B.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_B.dql
deleted file mode 100644
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_C.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CE.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CF.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CG.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_D.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_DE.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_E.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_F.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_G.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_B.dql
deleted file mode 100644
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/minmodel.properties b/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/minmodel.properties
deleted file mode 100644
index b003bdf2ce2cef82cdc5f8807bcffa80136a8537..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/minmodel.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/min.usageprofile
-dml.files.system=/../DML-Model/min.system
-dml.files.resourcelandscape=/../DML-Model/min.resourcelandscape
-dml.files.repository=/../DML-Model/min.repository
-dml.files.deployment=/../DML-Model/min.deployment
-#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/README b/dml-examples/CS-SyntheticComponents_WEKA/README
deleted file mode 100644
index 079c707c04cd5ad2c57d5dd9556fcb8bfc0b8122..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_WEKA/README
+++ /dev/null
@@ -1 +0,0 @@
-This the "hello world" example for the Descartes Modeling Language.
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.deployment b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.deployment
deleted file mode 100644
index 151b47197df5d4fb1a1b3f65915ae2541cd95968..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.deployment
+++ /dev/null
@@ -1,33 +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="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <targetResourceLandscape href="min.resourcelandscape#_FE29UEnuEeOWVc_o6w1CBw"/>
-  <deploymentContexts id="_cpot0O2fEeib_P5jAe7dPw" name="A --> CPA">
-    <assemblyContext href="min.system#A"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_EuLk4ObvEeWHMYaSILpfIw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_c_BH8e2fEeib_P5jAe7dPw" name="B --> CPB">
-    <assemblyContext href="min.system#B"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_We1_g-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dD0vce2fEeib_P5jAe7dPw" name="C --> CPC">
-    <assemblyContext href="min.system#C"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_WjRMg-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dJi88e2fEeib_P5jAe7dPw" name="D --> CPD">
-    <assemblyContext href="min.system#D"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_Wr9Oc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dT7A8e2fEeib_P5jAe7dPw" name="E --> CPE">
-    <assemblyContext href="min.system#E"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W2Lhc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_dcUH8e2fEeib_P5jAe7dPw" name="F --> CPF">
-    <assemblyContext href="min.system#F"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_W9C-c-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-  <deploymentContexts id="_othWce2fEeib_P5jAe7dPw" name="G --> CPG">
-    <assemblyContext href="min.system#G"/>
-    <resourceContainer xsi:type="resourcelandscape:ComputeNode" href="min.resourcelandscape#_XFIjc-2fEeib_P5jAe7dPw"/>
-  </deploymentContexts>
-</deployment:Deployment>
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.repository b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.repository
deleted file mode 100644
index 22010a146a3127ef3d7bfa042758d3ecd8bcde2b..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.repository
+++ /dev/null
@@ -1,300 +0,0 @@
-<?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">
-  <interfaces id="_uqNJk-2aEeib_P5jAe7dPw" name="A">
-    <signatures id="_vzGrUO2aEeib_P5jAe7dPw" name="A"/>
-    <signatures id="_49OlcAFjEeq06dmsv2l6pA" name="A2"/>
-  </interfaces>
-  <interfaces id="_xapQ4O2aEeib_P5jAe7dPw" name="B">
-    <signatures id="_xapQ4e2aEeib_P5jAe7dPw" name="B"/>
-    <signatures id="_89HicAFjEeq06dmsv2l6pA" name="B2"/>
-  </interfaces>
-  <interfaces id="_xf4WMu2aEeib_P5jAe7dPw" name="C">
-    <signatures id="_xf4WM-2aEeib_P5jAe7dPw" name="C"/>
-    <signatures id="_-Y0rcAFjEeq06dmsv2l6pA" name="C2"/>
-  </interfaces>
-  <interfaces id="_I6TZQu2bEeib_P5jAe7dPw" name="D">
-    <signatures id="_I6TZQ-2bEeib_P5jAe7dPw" name="D"/>
-    <signatures id="_yTRWMAIkEeqJ55W0svXqzQ" name="D2"/>
-  </interfaces>
-  <interfaces id="_JCed0e2bEeib_P5jAe7dPw" name="E">
-    <signatures id="_JCed0u2bEeib_P5jAe7dPw" name="E"/>
-    <signatures id="_0IbhAAIkEeqJ55W0svXqzQ" name="E2"/>
-  </interfaces>
-  <interfaces id="_JTZ1wu2bEeib_P5jAe7dPw" name="F">
-    <signatures id="_JTZ1w-2bEeib_P5jAe7dPw" name="F"/>
-    <signatures id="_1d3C4AIkEeqJ55W0svXqzQ" name="F2"/>
-  </interfaces>
-  <interfaces id="_JqhVQu2bEeib_P5jAe7dPw" name="G">
-    <signatures id="_JqhVQ-2bEeib_P5jAe7dPw" name="G"/>
-  </interfaces>
-  <components xsi:type="repository:BasicComponent" id="_Q2VbtO2bEeib_P5jAe7dPw" name="A">
-    <interfaceProvidingRoles id="_SHb3MO2bEeib_P5jAe7dPw" name="A" interface="_uqNJk-2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_S0bgEe2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_vzGrUO2aEeib_P5jAe7dPw" interfaceProvidingRole="_SHb3MO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Z0axAO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.05"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_jPXogO2bEeib_P5jAe7dPw" name="ToB" signature="_xapQ4e2aEeib_P5jAe7dPw" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_49OlcAFjEeq06dmsv2l6pA" interfaceProvidingRole="_SHb3MO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_EiBloAIlEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="30"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:BranchAction">
-          <branches>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_M_cd4AIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-            </actions>
-          </branches>
-          <branches>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_eWLgMQIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-            </actions>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_fvXgsQIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
-            </actions>
-          </branches>
-          <branchProbabilities id="_gc2RwAIlEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.5"/>
-            </explicitDescription>
-          </branchProbabilities>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_ng-npO2bEeib_P5jAe7dPw" name="B">
-    <interfaceProvidingRoles id="_oTaxMO2bEeib_P5jAe7dPw" name="B" interface="_xapQ4O2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_o-tJ4e2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_pW0u8e2bEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xapQ4e2aEeib_P5jAe7dPw" interfaceProvidingRole="_oTaxMO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_wQn4UO2bEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_1XjV4O2bEeib_P5jAe7dPw" name="ToC" signature="_xf4WM-2aEeib_P5jAe7dPw" interfaceRequiringRole="_o-tJ4e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_3Nfj0O2bEeib_P5jAe7dPw" name="ToE" signature="_JCed0u2bEeib_P5jAe7dPw" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_89HicAFjEeq06dmsv2l6pA" interfaceProvidingRole="_oTaxMO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_xKIucAIlEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.066666666"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_Gwyt0AImEeqJ55W0svXqzQ" name="ToC2" signature="_-Y0rcAFjEeq06dmsv2l6pA" interfaceRequiringRole="_o-tJ4e2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_KZ6woAImEeqJ55W0svXqzQ" name="ToE2" signature="_0IbhAAIkEeqJ55W0svXqzQ" interfaceRequiringRole="_pW0u8e2bEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_5tliBO2bEeib_P5jAe7dPw" name="C">
-    <interfaceProvidingRoles id="_7gZjcO2bEeib_P5jAe7dPw" name="C" interface="_xf4WMu2aEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_674hIe2bEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_xf4WM-2aEeib_P5jAe7dPw" interfaceProvidingRole="_7gZjcO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_CXbssO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:LoopAction">
-          <loopBodyBehavior>
-            <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_W7bVMO2cEeib_P5jAe7dPw" name="ToD" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
-            </actions>
-          </loopBodyBehavior>
-          <loopIterationCount id="_HkxUQO2cEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:IntLiteral" value="5"/>
-            </explicitDescription>
-          </loopIterationCount>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_-Y0rcAFjEeq06dmsv2l6pA" interfaceProvidingRole="_7gZjcO2bEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Zod-cAImEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="20" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_iicP0AImEeqJ55W0svXqzQ" name="ToD" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_lJOE0AImEeqJ55W0svXqzQ" name="ToD2" signature="_yTRWMAIkEeqJ55W0svXqzQ" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_szxFBO2dEeib_P5jAe7dPw" name="D">
-    <interfaceProvidingRoles id="_uP8vIO2dEeib_P5jAe7dPw" name="D" interface="_I6TZQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_uP8vIO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_zA8Y8O2dEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="10" sigma="1"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_yTRWMAIkEeqJ55W0svXqzQ" interfaceProvidingRole="_uP8vIO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_qtMDsAImEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.1"/>
-            </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="_59cRBO2dEeib_P5jAe7dPw" name="E">
-    <interfaceProvidingRoles id="_6wgFoO2dEeib_P5jAe7dPw" name="E" interface="_JCed0e2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7K9NAe2dEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <interfaceRequiringRoles id="_7nafge2dEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JCed0u2bEeib_P5jAe7dPw" interfaceProvidingRole="_6wgFoO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Df43oO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.2"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_NSR-wO2eEeib_P5jAe7dPw" name="ToF" signature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7K9NAe2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_PVKcgO2eEeib_P5jAe7dPw" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_0IbhAAIkEeqJ55W0svXqzQ" interfaceProvidingRole="_6wgFoO2dEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_07Wg0AImEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.2"/>
-            </explicitDescription>
-            <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-          </resourceDemand>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_4JXU8AImEeqJ55W0svXqzQ" name="ToF2" signature="_1d3C4AIkEeqJ55W0svXqzQ" interfaceRequiringRole="_7K9NAe2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_8d9WoAImEeqJ55W0svXqzQ" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
-        </actions>
-        <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_-xSrMAImEeqJ55W0svXqzQ" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-  </components>
-  <components xsi:type="repository:BasicComponent" id="_RZ57dO2eEeib_P5jAe7dPw" name="F">
-    <interfaceProvidingRoles id="_S_LQIO2eEeib_P5jAe7dPw" name="F" interface="_JTZ1wu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JTZ1w-2bEeib_P5jAe7dPw" interfaceProvidingRole="_S_LQIO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:BranchAction">
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_cG0KEO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="20"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branches>
-            <actions xsi:type="servicebehavior:InternalAction">
-              <resourceDemand id="_gSfgUe2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-                <explicitDescription>
-                  <probFunction xsi:type="functions:DoubleLiteral" value="100"/>
-                </explicitDescription>
-                <resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-              </resourceDemand>
-            </actions>
-          </branches>
-          <branchProbabilities id="_XbBJUO2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:DoubleLiteral" value="0.8"/>
-            </explicitDescription>
-          </branchProbabilities>
-        </actions>
-      </behavior>
-    </fineGrainedBehavior>
-    <fineGrainedBehavior describedSignature="_1d3C4AIkEeqJ55W0svXqzQ" interfaceProvidingRole="_S_LQIO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_Fho9oAInEeqJ55W0svXqzQ">
-            <explicitDescription>
-              <probFunction xsi:type="functions:NormalDistribution" mu="40" sigma="2"/>
-            </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="_R1LiNO2eEeib_P5jAe7dPw" name="G">
-    <interfaceProvidingRoles id="_TRbdwO2eEeib_P5jAe7dPw" name="G" interface="_JqhVQu2bEeib_P5jAe7dPw"/>
-    <fineGrainedBehavior describedSignature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceProvidingRole="_TRbdwO2eEeib_P5jAe7dPw">
-      <behavior>
-        <actions xsi:type="servicebehavior:InternalAction">
-          <resourceDemand id="_mprE0O2eEeib_P5jAe7dPw" characterization="EXPLICIT">
-            <explicitDescription>
-              <probFunction xsi:type="functions:ExponentialDistribution" rate="0.03333333333"/>
-            </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/CS-SyntheticComponents_wodelay/DML-Model/min.resourcelandscape b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.resourcelandscape
deleted file mode 100644
index 855377e342e9bda7937f579a1d5d4cdd1e3ad541..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.resourcelandscape
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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="CPA">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_yS7WwfMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_0rctUPMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_We1_g-2fEeib_P5jAe7dPw" name="CPB">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_We1_hO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_We1_he2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6JPywPMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6JPywfMLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_WjRMg-2fEeib_P5jAe7dPw" name="CPC">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_WjRMhO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_WjRMhe2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6aFrIvMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6aFrI_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_Wr9Oc-2fEeib_P5jAe7dPw" name="CPD">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_Wr9OdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_Wr9Ode2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_6uWD4vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_6uWD4_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W2Lhc-2fEeib_P5jAe7dPw" name="CPE">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W2LhdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W2Lhde2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7J0e8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7J0e8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_W9C-c-2fEeib_P5jAe7dPw" name="CPF">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_W9C-dO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_W9C-de2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_7nRP8vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_7nRP8_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-    <computeNodes id="_XFIjc-2fEeib_P5jAe7dPw" name="CPG">
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_XFIjdO2fEeib_P5jAe7dPw" name="CPU" schedulingPolicy="FCFS" processingRate="1000.0">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_XFIjde2fEeib_P5jAe7dPw" name="multiplicity" number="2"/>
-      </configSpec>
-      <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_8FUd4vMLEeiRdfQDBIGrTA" name="Network">
-        <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_52tLYJB4EeKmfoqNH_-HEA"/>
-        <nrOfParProcUnits id="_8FUd4_MLEeiRdfQDBIGrTA" name="multiplicity" number="10000"/>
-      </configSpec>
-    </computeNodes>
-  </consistsOf>
-</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system
deleted file mode 100644
index 3ce344d174d95014bf0356ff86f3febb7b0918f5..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="A" name="A">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="262.84963425757894"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="25.1950842561908" knot="9" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.976227106218841" knot="9">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-18.661905059764372" knot="107" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_ng-npO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="232.2645484858773"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="25.52707636070293" knot="8" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-5.8673196423639755" knot="8">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-1.4301195149020542" knot="58" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_5tliBO2bEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="111.82389647914309"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="26.158780903204537" knot="4" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-8.269589171172274" knot="4">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-1.5943941620931752" knot="37" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_szxFBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="1777.895105277294"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-12.048274165389246" knot="4" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="13.624554538340941" knot="4">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-17.19997044564344" knot="106">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_59cRBO2dEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="80.694074311176"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="12.175649652283221" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-2.6639153640224316" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-14.347524289871105" knot="18" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_RZ57dO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="196540843982208.88"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-39308168796415.17" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="39308168796422.97" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="39308168796428.94" knot="7" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-39308168796432.36" knot="7">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_R1LiNO2eEeib_P5jAe7dPw"/>
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-      <basisFunctions xsi:type="system:Constant" coefficient="41.50498064823611"/>
-      <basisFunctions xsi:type="system:Hinge" coefficient="11.831802896944605" knot="2" side="RIGHT">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-      <basisFunctions xsi:type="system:Hinge" coefficient="-8.973996639715038" knot="2">
-        <variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
-        </variableReference>
-      </basisFunctions>
-    </statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --> B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --> C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --> D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --> E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --> F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --> G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw"/>
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
-  </assemblyConnectors>
-  <providingDelegationConnectors id="_7NJv8u2eEeib_P5jAe7dPw" name="A --> A" assemblyContext="A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw"/>
-  </interfaceProvidingRoles>
-</system:System>
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system.bak b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system.bak
deleted file mode 100644
index 3cdb13a02436942b69798895c41abd40aa854575..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.system.bak
+++ /dev/null
@@ -1,165 +0,0 @@
-<system:System xmlns:system="http://www.descartes.tools/metamodel/system/1.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="_zdRVAEeoEeSW4Op0B0CyhQ" name="MySys" xmi:version="2.0">
-  <assemblyContexts id="A" name="A">
-    <encapsulatedComponent href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="262.84963425757894" xsi:type="system:Constant" /><basisFunctions coefficient="25.1950842561908" knot="9" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.976227106218841" knot="9" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-18.661905059764372" knot="107" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="B" name="B">
-    <encapsulatedComponent href="min.repository#_ng-npO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="232.2645484858773" xsi:type="system:Constant" /><basisFunctions coefficient="25.52707636070293" knot="8" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.8673196423639755" knot="8" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.4301195149020542" knot="58" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="C" name="C">
-    <encapsulatedComponent href="min.repository#_5tliBO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="111.82389647914309" xsi:type="system:Constant" /><basisFunctions coefficient="26.158780903204537" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.269589171172274" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.5943941620931752" knot="37" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="D" name="D">
-    <encapsulatedComponent href="min.repository#_szxFBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="1777.895105277294" xsi:type="system:Constant" /><basisFunctions coefficient="-12.048274165389246" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="13.624554538340941" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-17.19997044564344" knot="106" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="E" name="E">
-    <encapsulatedComponent href="min.repository#_59cRBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="80.694074311176" xsi:type="system:Constant" /><basisFunctions coefficient="12.175649652283221" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-2.6639153640224316" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-14.347524289871105" knot="18" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="F" name="F">
-    <encapsulatedComponent href="min.repository#_RZ57dO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="196540843982208.88" xsi:type="system:Constant" /><basisFunctions coefficient="-39308168796415.17" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796422.97" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796428.94" knot="7" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-39308168796432.36" knot="7" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyContexts id="G" name="G">
-    <encapsulatedComponent href="min.repository#_R1LiNO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="41.50498064823611" xsi:type="system:Constant" /><basisFunctions coefficient="11.831802896944605" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.973996639715038" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
-  </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --&gt; B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --&gt; C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --&gt; D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --&gt; E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --&gt; F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --&gt; G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-  </assemblyConnectors>
-  <providingDelegationConnectors assemblyContext="A" id="_7NJv8u2eEeib_P5jAe7dPw" name="A --&gt; A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-  </providingDelegationConnectors>
-  <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw" />
-  </interfaceProvidingRoles>
-</system:System>
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.usageprofile b/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.usageprofile
deleted file mode 100644
index d61e948e7347d82ae53a57723768b27124d807bb..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DML-Model/min.usageprofile
+++ /dev/null
@@ -1,32 +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="usgProfile">
-  <imports importURI="min.system"/>
-  <imports importURI="min.repository"/>
-  <system href="min.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="WC1">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="usageToA1">
-        <providingRole href="min.system#_43ITxO2eEeib_P5jAe7dPw"/>
-        <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="0.0025"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-  <usageScenarios id="_o2KwYAFlEeq06dmsv2l6pA" name="WC2">
-    <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_o2LXcAFlEeq06dmsv2l6pA" name="usageToA2">
-        <providingRole href="min.system#_43ITxO2eEeib_P5jAe7dPw"/>
-        <signature href="min.repository#_49OlcAFjEeq06dmsv2l6pA"/>
-      </actions>
-    </scenarioBehavior>
-    <workloadType xsi:type="usageprofile:OpenWorkloadType">
-      <interArrivalTime>
-        <probFunction xsi:type="functions:ExponentialDistribution" rate="0.0025"/>
-      </interArrivalTime>
-    </workloadType>
-  </usageScenarios>
-</usageprofile:UsageProfile>
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis.dql
deleted file mode 100644
index 05e052d390a05f02ea4b33efae9869e4c9b3ecf3..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime, usageToA.throughput
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_A.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_B.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_B.dql
deleted file mode 100644
index 9f64a755d0fcf1f11b2c4bdf5fde7a0b047c3513..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, CPA_CPU.utilization, ToB.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_C.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_C.dql
deleted file mode 100644
index c22e02f702c0f8131aeb747da2e1a2a0c1aacf63..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CE.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CE.dql
deleted file mode 100644
index 7b6c2add372e5fcbe2c0b3bebc56146e6f198763..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CF.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CF.dql
deleted file mode 100644
index ee7052cc316140e384047868c10c58752489ad46..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CG.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CG.dql
deleted file mode 100644
index 5b598836fd88e2f2a56a789a8309338ee21f2bf7..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_D.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_D.dql
deleted file mode 100644
index c917706a5995679b94c94a2e18dffd6da3d40323..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_DE.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_DE.dql
deleted file mode 100644
index 236885ae632e45744d1d134cd0988e013095d904..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_E.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_E.dql
deleted file mode 100644
index 7a2f201841b1b4163ecf1389b4818fe6d0393d86..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_F.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_F.dql
deleted file mode 100644
index 320108c326024f375d76987c9c850806765fe0cf..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPG_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_G.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_G.dql
deleted file mode 100644
index 7b2029c1d3bc7267a92b0dd6662f70521d3ebb1b..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/Analysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime, ToB.avgResponseTime, ToC.avgResponseTime, ToD.avgResponseTime, ToE.avgResponseTime, ToF.avgResponseTime, ToG.avgResponseTime, CPA_CPU.utilization, CPB_CPU.utilization, CPC_CPU.utilization, CPD_CPU.utilization, CPE_CPU.utilization, CPF_CPU.utilization
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis.dql
deleted file mode 100644
index eb7655f15f9f6e7b9289269df92c18b3b257ae2e..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT	usageToA.avgResponseTime
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_A.dql
deleted file mode 100644
index 234b6cffb24aa35402d1962f9ace4d376caf4ed2..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_A.dql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:A'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_B.dql
deleted file mode 100644
index ce4bdad143e0924e8822c93d09bccb52ebd246cc..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_B.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:B'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_C.dql
deleted file mode 100644
index 368207562086fc13b7cc9a9878bdcdabf201963b..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_C.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CE.dql
deleted file mode 100644
index 8ab240aefc1e2c5b91dea753babe6cbd7a42f1c9..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CF.dql
deleted file mode 100644
index 54bb1c2346d2d2b0b27bf61df86a1fcf095a7e92..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CF.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CG.dql
deleted file mode 100644
index 499a3449ba26349c0dec8e0a69f5c367ababf581..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_CG.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:C:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_D.dql
deleted file mode 100644
index fdbc0e87bc87f0487c36bfa37cde31438524648f..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_D.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_DE.dql
deleted file mode 100644
index 5c796306aa5f93c081f33bbeab41c771ff279c28..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_DE.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:D:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_E.dql
deleted file mode 100644
index b4a02fd19e9d00e0afe82df3140d50ee16944320..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_E.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:E'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_F.dql
deleted file mode 100644
index 864f0ef63acca6ec91d0fe7afb04ab2dce41b617..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_F.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:F'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_G.dql
deleted file mode 100644
index ea851f2c026ea0d1a0f3a47dd70b9762ab0bbb89..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/TimeAnalysis_G.dql
+++ /dev/null
@@ -1,27 +0,0 @@
-SELECT usageToA.avgResponseTime
-CONSTRAINED AS 'USE_STATISTICAL_MODEL:G'
-EVALUATE DOF
-	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	usageToA,
-	SERVICE	'_3Nfj0O2bEeib_P5jAe7dPw'	AS	ToE,
-	SERVICE	'_1XjV4O2bEeib_P5jAe7dPw'	AS	ToC,
-	SERVICE	'_PVKcgO2eEeib_P5jAe7dPw'	AS	ToG,
-	SERVICE	'_NSR-wO2eEeib_P5jAe7dPw'	AS	ToF,
-	SERVICE	'_jPXogO2bEeib_P5jAe7dPw'	AS	ToB,
-	SERVICE	'_W7bVMO2cEeib_P5jAe7dPw'	AS	ToD,
-	RESOURCE	'_6uWD4vMLEeiRdfQDBIGrTA'	AS	CPD_Network,
-	RESOURCE	'_7J0e8vMLEeiRdfQDBIGrTA'	AS	CPE_Network,
-	RESOURCE	'_XFIjdO2fEeib_P5jAe7dPw'	AS	CPG_CPU,
-	RESOURCE	'_WjRMhO2fEeib_P5jAe7dPw'	AS	CPC_CPU,
-	RESOURCE	'_8FUd4vMLEeiRdfQDBIGrTA'	AS	CPG_Network,
-	RESOURCE	'_We1_hO2fEeib_P5jAe7dPw'	AS	CPB_CPU,
-	RESOURCE	'_W9C-dO2fEeib_P5jAe7dPw'	AS	CPF_CPU,
-	RESOURCE	'_6aFrIvMLEeiRdfQDBIGrTA'	AS	CPC_Network,
-	RESOURCE	'_Wr9OdO2fEeib_P5jAe7dPw'	AS	CPD_CPU,
-	RESOURCE	'_I3tj4EnuEeOWVc_o6w1CBw'	AS	CPA_CPU,
-	RESOURCE	'_6JPywPMLEeiRdfQDBIGrTA'	AS	CPB_Network,
-	RESOURCE	'_W2LhdO2fEeib_P5jAe7dPw'	AS	CPE_CPU,
-	RESOURCE	'_7nRP8vMLEeiRdfQDBIGrTA'	AS	CPF_Network,
-	RESOURCE	'_yS7WwfMLEeiRdfQDBIGrTA'	AS	CPA_Network
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/minmodel.properties b/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/minmodel.properties
deleted file mode 100644
index b003bdf2ce2cef82cdc5f8807bcffa80136a8537..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/DQL-Queries/minmodel.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../DML-Model/min.usageprofile
-dml.files.system=/../DML-Model/min.system
-dml.files.resourcelandscape=/../DML-Model/min.resourcelandscape
-dml.files.repository=/../DML-Model/min.repository
-dml.files.deployment=/../DML-Model/min.deployment
-#dml.outputdirectory=/../results/
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents_wodelay/README b/dml-examples/CS-SyntheticComponents_wodelay/README
deleted file mode 100644
index 079c707c04cd5ad2c57d5dd9556fcb8bfc0b8122..0000000000000000000000000000000000000000
--- a/dml-examples/CS-SyntheticComponents_wodelay/README
+++ /dev/null
@@ -1 +0,0 @@
-This the "hello world" example for the Descartes Modeling Language.
\ No newline at end of file
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/A_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/A_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..0a60578852a5f1666f2422a9fcdc774687315cf7
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/A_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/B_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/B_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..c7fd9ed2cf1b9d094b7035e2b3d97e983afae72a
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/B_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/C_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/C_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..a2297413cf862b02b244c44a8c34fb6a4a8fef45
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/C_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/D_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/D_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..8e477048be01de1bfaa77b2d39c01126ace7003c
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/D_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/E_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/E_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..282cd06fc732c3396755aead8ab5ddec98b86ceb
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/E_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/F_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/F_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..835c156b2611d567ef884b95db888110b312180b
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/F_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/G_RandomForest.model b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/G_RandomForest.model
new file mode 100644
index 0000000000000000000000000000000000000000..cbde1681d01a7f3fbd19913cbfb16eee6ad552c9
Binary files /dev/null and b/dml-examples/SyntheticComponents/DML-Model/StatisticalModels/G_RandomForest.model differ
diff --git a/dml-examples/SyntheticComponents/DML-Model/min.system b/dml-examples/SyntheticComponents/DML-Model/min.system
index 18bc004b247cf521cab3aabde4be39fec51d2b32..2b7821b42c20e8c45d0497a485261acc5375f0e1 100644
--- a/dml-examples/SyntheticComponents/DML-Model/min.system
+++ b/dml-examples/SyntheticComponents/DML-Model/min.system
@@ -1,165 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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="A" name="A">
-    <encapsulatedComponent href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="262.84963425757894" xsi:type="system:Constant" /><basisFunctions coefficient="25.1950842561908" knot="9" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.976227106218841" knot="9" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-18.661905059764372" knot="107" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_Q2VbtO2bEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\A_RandomForest.model">
+      <describedSignature href="min.repository#_vzGrUO2aEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="B" name="B">
-    <encapsulatedComponent href="min.repository#_ng-npO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="232.2645484858773" xsi:type="system:Constant" /><basisFunctions coefficient="25.52707636070293" knot="8" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-5.8673196423639755" knot="8" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.4301195149020542" knot="58" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_ng-npO2bEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\B_RandomForest.model">
+      <describedSignature href="min.repository#_xapQ4e2aEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="C" name="C">
-    <encapsulatedComponent href="min.repository#_5tliBO2bEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="111.82389647914309" xsi:type="system:Constant" /><basisFunctions coefficient="26.158780903204537" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.269589171172274" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-1.5943941620931752" knot="37" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
-          <signature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_5tliBO2bEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\C_RandomForest.model">
+      <describedSignature href="min.repository#_xf4WM-2aEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="D" name="D">
-    <encapsulatedComponent href="min.repository#_szxFBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="1777.895105277294" xsi:type="system:Constant" /><basisFunctions coefficient="-12.048274165389246" knot="4" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="13.624554538340941" knot="4" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-17.19997044564344" knot="106" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_szxFBO2dEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\D_RandomForest.model">
+      <describedSignature href="min.repository#_I6TZQ-2bEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="E" name="E">
-    <encapsulatedComponent href="min.repository#_59cRBO2dEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="80.694074311176" xsi:type="system:Constant" /><basisFunctions coefficient="12.175649652283221" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-2.6639153640224316" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-14.347524289871105" knot="18" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JCed0u2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_59cRBO2dEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\E_RandomForest.model">
+      <describedSignature href="min.repository#_JCed0u2bEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="F" name="F">
-    <encapsulatedComponent href="min.repository#_RZ57dO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="196540843982208.88" xsi:type="system:Constant" /><basisFunctions coefficient="-39308168796415.17" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796422.97" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="39308168796428.94" knot="7" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-39308168796432.36" knot="7" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_RZ57dO2eEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\F_RandomForest.model">
+      <describedSignature href="min.repository#_JTZ1w-2bEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
   <assemblyContexts id="G" name="G">
-    <encapsulatedComponent href="min.repository#_R1LiNO2eEeib_P5jAe7dPw" xsi:type="repository:BasicComponent" />
-    <statisticalModel xsi:type="system:MARSModel">
-      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-      <basisFunctions coefficient="41.50498064823611" xsi:type="system:Constant" /><basisFunctions coefficient="11.831802896944605" knot="2" side="RIGHT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions><basisFunctions coefficient="-8.973996639715038" knot="2" side="LEFT" xsi:type="system:Hinge"><variableReference xsi:type="system:WorkloadIntensity">
-          <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
-          <signature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw" />
-        </variableReference>
-      </basisFunctions></statisticalModel>
+    <encapsulatedComponent xsi:type="repository:BasicComponent" href="min.repository#_R1LiNO2eEeib_P5jAe7dPw"/>
+    <statisticalModel xsi:type="system:WEKAModel" absoluteModelPath="\StatisticalModels\G_RandomForest.model">
+      <describedSignature href="min.repository#_JqhVQ-2bEeib_P5jAe7dPw"/>
+      <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
+    </statisticalModel>
   </assemblyContexts>
-  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --&gt; B" providingAssemblyContext="B" requiringAssemblyContext="A">
-    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw" />
+  <assemblyConnectors id="_95dlMe2eEeib_P5jAe7dPw" name="A --> B" providingAssemblyContext="B" requiringAssemblyContext="A">
+    <interfaceRequiringRole href="min.repository#_S0bgEe2bEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_oTaxMO2bEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --&gt; C" providingAssemblyContext="C" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw" />
+  <assemblyConnectors id="_-u-Q4e2eEeib_P5jAe7dPw" name="B --> C" providingAssemblyContext="C" requiringAssemblyContext="B">
+    <interfaceRequiringRole href="min.repository#_o-tJ4e2bEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_7gZjcO2bEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --&gt; D" providingAssemblyContext="D" requiringAssemblyContext="C">
-    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw" />
+  <assemblyConnectors id="__Da24e2eEeib_P5jAe7dPw" name="C --> D" providingAssemblyContext="D" requiringAssemblyContext="C">
+    <interfaceRequiringRole href="min.repository#_674hIe2bEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_uP8vIO2dEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --&gt; E" providingAssemblyContext="E" requiringAssemblyContext="B">
-    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw" />
+  <assemblyConnectors id="__NpJ4e2eEeib_P5jAe7dPw" name="B --> E" providingAssemblyContext="E" requiringAssemblyContext="B">
+    <interfaceRequiringRole href="min.repository#_pW0u8e2bEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_6wgFoO2dEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --&gt; F" providingAssemblyContext="F" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw" />
+  <assemblyConnectors id="__X3c4e2eEeib_P5jAe7dPw" name="E --> F" providingAssemblyContext="F" requiringAssemblyContext="E">
+    <interfaceRequiringRole href="min.repository#_7K9NAe2dEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_S_LQIO2eEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --&gt; G" providingAssemblyContext="G" requiringAssemblyContext="E">
-    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw" />
-    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw" />
+  <assemblyConnectors id="__iQH8e2eEeib_P5jAe7dPw" name="E --> G" providingAssemblyContext="G" requiringAssemblyContext="E">
+    <interfaceRequiringRole href="min.repository#_7nafge2dEeib_P5jAe7dPw"/>
+    <interfaceProvidingRole href="min.repository#_TRbdwO2eEeib_P5jAe7dPw"/>
   </assemblyConnectors>
-  <providingDelegationConnectors assemblyContext="A" id="_7NJv8u2eEeib_P5jAe7dPw" name="A --&gt; A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
-    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw" />
+  <providingDelegationConnectors id="_7NJv8u2eEeib_P5jAe7dPw" name="A --> A" assemblyContext="A" outerInterfaceProvidingRole="_43ITxO2eEeib_P5jAe7dPw">
+    <innerInterfaceProvidingRole href="min.repository#_SHb3MO2bEeib_P5jAe7dPw"/>
   </providingDelegationConnectors>
   <interfaceProvidingRoles id="_43ITxO2eEeib_P5jAe7dPw" name="outerA">
-    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw" />
+    <interface href="min.repository#_uqNJk-2aEeib_P5jAe7dPw"/>
   </interfaceProvidingRoles>
-</system:System>
\ No newline at end of file
+</system:System>
diff --git a/dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql
index eb7655f15f9f6e7b9289269df92c18b3b257ae2e..05e052d390a05f02ea4b33efae9869e4c9b3ecf3 100644
--- a/dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql
+++ b/dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql
@@ -1,4 +1,4 @@
-SELECT	usageToA.avgResponseTime
+SELECT	usageToA.avgResponseTime, usageToA.throughput
 EVALUATE DOF
 	VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
 FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
diff --git a/dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents_WEKA/DQL-Queries/TimeAnalysis.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis.dql