diff --git a/dml-examples/PetsupplyStore/DML-Model/petsupplystore.repository b/dml-examples/PetsupplyStore/DML-Model/petsupplystore.repository
index 7f5ed4041f08fa82ffa191cd391f79559e4e0e5f..61b69d04a965eb4cbb54cbb122ebd96ee4e8cdb8 100644
--- a/dml-examples/PetsupplyStore/DML-Model/petsupplystore.repository
+++ b/dml-examples/PetsupplyStore/DML-Model/petsupplystore.repository
@@ -4,22 +4,22 @@
     <signatures id="_h7eHYJ7EEeec6726JGgl9g" name="displayProductPage()"/>
   </interfaces>
   <interfaces id="_2XSCc_RyEeeVC4IUdNxbmA" name="ImageProvider">
-    <signatures id="_BZ6CYPRzEeeVC4IUdNxbmA" name="getIcon()"/>
-    <signatures id="_Bw1UoPRzEeeVC4IUdNxbmA" name="getProductImage()"/>
-    <signatures id="_qhhf8fRzEeeVC4IUdNxbmA" name="getPreviewImage()"/>
+    <signatures id="_BZ6CYPRzEeeVC4IUdNxbmA" name="getIcon"/>
+    <signatures id="_Bw1UoPRzEeeVC4IUdNxbmA" name="getProductImage"/>
+    <signatures id="_qhhf8fRzEeeVC4IUdNxbmA" name="getPreviewImage"/>
   </interfaces>
   <interfaces id="_usedc_RzEeeVC4IUdNxbmA" name="Store">
-    <signatures id="_xaRgcPRzEeeVC4IUdNxbmA" name="getProductInformation()"/>
-    <signatures id="_yn-psPRzEeeVC4IUdNxbmA" name="getRecommendedProducts()"/>
-    <signatures id="_y4smQPRzEeeVC4IUdNxbmA" name="getCategories()"/>
-    <signatures id="_5S_BwPR2EeeVC4IUdNxbmA" name="isLoggedIn()"/>
+    <signatures id="_xaRgcPRzEeeVC4IUdNxbmA" name="getProductInformation"/>
+    <signatures id="_yn-psPRzEeeVC4IUdNxbmA" name="getRecommendedProducts"/>
+    <signatures id="_y4smQPRzEeeVC4IUdNxbmA" name="getCategories"/>
+    <signatures id="_5S_BwPR2EeeVC4IUdNxbmA" name="isLoggedIn"/>
   </interfaces>
   <interfaces id="_BQlR0_R0EeeVC4IUdNxbmA" name="PersistenceProvider">
-    <signatures id="_DfLQUPR0EeeVC4IUdNxbmA" name="getProductInformation()"/>
-    <signatures id="_HoQlkPR0EeeVC4IUdNxbmA" name="getCategories()"/>
+    <signatures id="_DfLQUPR0EeeVC4IUdNxbmA" name="getProductInformation"/>
+    <signatures id="_HoQlkPR0EeeVC4IUdNxbmA" name="getCategories"/>
   </interfaces>
   <interfaces id="_KrshY_R0EeeVC4IUdNxbmA" name="Recommender">
-    <signatures id="_ZL_iEPR0EeeVC4IUdNxbmA" name="getRecommendedProducts()"/>
+    <signatures id="_ZL_iEPR0EeeVC4IUdNxbmA" name="getRecommendedProducts"/>
   </interfaces>
   <components xsi:type="repository:BasicComponent" id="_miQFRJ7EEeec6726JGgl9g" name="WebUI">
     <interfaceProvidingRoles id="_lHviYPR0EeeVC4IUdNxbmA" name="WebUI" interface="_gVNUM57EEeec6726JGgl9g"/>
@@ -27,7 +27,7 @@
     <interfaceRequiringRoles id="_4XGTMfR0EeeVC4IUdNxbmA" name="ImageProvider" interface="_2XSCc_RyEeeVC4IUdNxbmA"/>
     <coarseGrainedBehavior describedSignature="_h7eHYJ7EEeec6726JGgl9g" interfaceProvidingRole="_lHviYPR0EeeVC4IUdNxbmA">
       <externalCallFrequency>
-        <externalCall id="_KQ78IfeiEee0rd0BOswRjQ" name="ImageProvider.getIcon()" signature="_BZ6CYPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_KQ78IfeiEee0rd0BOswRjQ" name="CImageProvider_getIcon" signature="_BZ6CYPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -35,7 +35,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_KwxSwfeiEee0rd0BOswRjQ" name="Store.getCategories()" signature="_y4smQPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_KwxSwfeiEee0rd0BOswRjQ" name="CStore_getCategories" signature="_y4smQPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286vbnhgn" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -43,7 +43,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_LPU3AfeiEee0rd0BOswRjQ" name="Store.getProductInformation()" signature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_LPU3AfeiEee0rd0BOswRjQ" name="CStore_getProductInformation" signature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286bvnvbn" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -51,7 +51,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_L6WxAfeiEee0rd0BOswRjQ" name="Store.isLoggedIn()" signature="_5S_BwPR2EeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_L6WxAfeiEee0rd0BOswRjQ" name="CStore_isLoggedIn" signature="_5S_BwPR2EeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286vbnvb" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -59,7 +59,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_Mq8gcfeiEee0rd0BOswRjQ" name="ImageProvider.getProductImage()" signature="_Bw1UoPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_Mq8gcfeiEee0rd0BOswRjQ" name="CImageProvider_getProductImage" signature="_Bw1UoPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286yxcyx" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -67,7 +67,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_NXSCAfeiEee0rd0BOswRjQ" name="Store.getRecommendedProducts()" signature="_yn-psPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_NXSCAfeiEee0rd0BOswRjQ" name="CStore_getRecommendedProducts" signature="_yn-psPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         <frequency id="aasdgasd" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -75,7 +75,7 @@
         </frequency>
       </externalCallFrequency>
       <externalCallFrequency>
-        <externalCall id="_OTw4YfeiEee0rd0BOswRjQ" name="ImageProvider.getPreviewImage()" signature="_qhhf8fRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_OTw4YfeiEee0rd0BOswRjQ" name="CImageProvider_getPreviewImage" signature="_qhhf8fRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
         <frequency id="74851286gasd" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="3"/>
@@ -100,27 +100,27 @@
           </resourceDemand>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_E_0HMPR1EeeVC4IUdNxbmA" name="ImageProvider.getIcon()" signature="_BZ6CYPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_E_0HMPR1EeeVC4IUdNxbmA" name="ImageProvider_getIcon" signature="_BZ6CYPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_JAH68PR1EeeVC4IUdNxbmA" name="Store.getCategories()" signature="_y4smQPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_JAH68PR1EeeVC4IUdNxbmA" name="Store_getCategories" signature="_y4smQPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_JYTxcPR1EeeVC4IUdNxbmA" name="Store.getProductInformation()" signature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_JYTxcPR1EeeVC4IUdNxbmA" name="Store_getProductInformation" signature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_cIj5gPR3EeeVC4IUdNxbmA" name="Store.isLoggedIn()" signature="_5S_BwPR2EeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_cIj5gPR3EeeVC4IUdNxbmA" name="Store_isLoggedIn" signature="_5S_BwPR2EeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_JmsywPR1EeeVC4IUdNxbmA" name="ImageProvider.getProductImage()" signature="_Bw1UoPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_JmsywPR1EeeVC4IUdNxbmA" name="ImageProvider_getProductImage" signature="_Bw1UoPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_VH5lEfR1EeeVC4IUdNxbmA" name="Store.getRecommendedProducts()" signature="_yn-psPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_VH5lEfR1EeeVC4IUdNxbmA" name="Store_getRecommendedProducts" signature="_yn-psPRzEeeVC4IUdNxbmA" interfaceRequiringRole="_2Pz2kfR0EeeVC4IUdNxbmA"/>
         </actions>
         <actions xsi:type="servicebehavior:LoopAction">
           <loopBodyBehavior>
             <actions xsi:type="servicebehavior:ExternalCallAction">
-              <externalCall id="_zu8m4PR1EeeVC4IUdNxbmA" name="ImageProvider.getPreviewImage()" signature="_qhhf8fRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
+              <externalCall id="_zu8m4PR1EeeVC4IUdNxbmA" name="ImageProvider_getPreviewImage" signature="_qhhf8fRzEeeVC4IUdNxbmA" interfaceRequiringRole="_4XGTMfR0EeeVC4IUdNxbmA"/>
             </actions>
           </loopBodyBehavior>
           <loopIterationCount id="123125tsydfcsgdfsgs" characterization="EXPLICIT">
@@ -249,7 +249,7 @@
     <interfaceRequiringRoles id="_xAeD4fR0EeeVC4IUdNxbmA" name="Recommender" interface="_KrshY_R0EeeVC4IUdNxbmA"/>
     <coarseGrainedBehavior describedSignature="_y4smQPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <externalCallFrequency>
-        <externalCall id="_6kiCwfejEee0rd0BOswRjQ" name="PersistenceProvider.getCategories()" signature="_HoQlkPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_6kiCwfejEee0rd0BOswRjQ" name="CPersistenceProvider_getCategories" signature="_HoQlkPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
         <frequency id="3" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -259,7 +259,7 @@
     </coarseGrainedBehavior>
     <coarseGrainedBehavior describedSignature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <externalCallFrequency>
-        <externalCall id="_7kd1wfejEee0rd0BOswRjQ" name="PersistenceProvider.getProductInformation()" signature="_DfLQUPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_7kd1wfejEee0rd0BOswRjQ" name="CPersistenceProvider_getProductInformation" signature="_DfLQUPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
         <frequency id="354641" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -269,7 +269,7 @@
     </coarseGrainedBehavior>
     <coarseGrainedBehavior describedSignature="_yn-psPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <externalCallFrequency>
-        <externalCall id="_8xXtwfejEee0rd0BOswRjQ" name="Recommender.getRecommendedProducts()" signature="_ZL_iEPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_xAeD4fR0EeeVC4IUdNxbmA"/>
+        <externalCall id="_8xXtwfejEee0rd0BOswRjQ" name="CRecommender_getRecommendedProducts" signature="_ZL_iEPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_xAeD4fR0EeeVC4IUdNxbmA"/>
         <frequency id="378698" characterization="EXPLICIT">
           <explicitDescription>
             <probFunction xsi:type="functions:IntLiteral" value="1"/>
@@ -288,21 +288,21 @@
     <fineGrainedBehavior describedSignature="_y4smQPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <behavior>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_TEAv0PR3EeeVC4IUdNxbmA" name="PersistenceProvider.getCategories()" signature="_HoQlkPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_TEAv0PR3EeeVC4IUdNxbmA" name="PersistenceProvider_getCategories" signature="_HoQlkPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
         </actions>
       </behavior>
     </fineGrainedBehavior>
     <fineGrainedBehavior describedSignature="_xaRgcPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <behavior>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_kSLE8PR3EeeVC4IUdNxbmA" name="PersistenceProvider.getProductInformation()" signature="_DfLQUPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_kSLE8PR3EeeVC4IUdNxbmA" name="PersistenceProvider_getProductInformation" signature="_DfLQUPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_whDkAfR0EeeVC4IUdNxbmA"/>
         </actions>
       </behavior>
     </fineGrainedBehavior>
     <fineGrainedBehavior describedSignature="_yn-psPRzEeeVC4IUdNxbmA" interfaceProvidingRole="_l71RwPR0EeeVC4IUdNxbmA">
       <behavior>
         <actions xsi:type="servicebehavior:ExternalCallAction">
-          <externalCall id="_MYNJsPR4EeeVC4IUdNxbmA" name="Recommender.getRecommendedProducts()" signature="_ZL_iEPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_xAeD4fR0EeeVC4IUdNxbmA"/>
+          <externalCall id="_MYNJsPR4EeeVC4IUdNxbmA" name="Recommender_getRecommendedProducts" signature="_ZL_iEPR0EeeVC4IUdNxbmA" interfaceRequiringRole="_xAeD4fR0EeeVC4IUdNxbmA"/>
         </actions>
       </behavior>
     </fineGrainedBehavior>
diff --git a/dml-examples/PetsupplyStore/DML-Model/petsupplystore.usageprofile b/dml-examples/PetsupplyStore/DML-Model/petsupplystore.usageprofile
index 85cf30fbfd39c581cf79603c4a91238a65b3b845..3b67dcc6b9f4528500728958811bb6440b2df9f7 100644
--- a/dml-examples/PetsupplyStore/DML-Model/petsupplystore.usageprofile
+++ b/dml-examples/PetsupplyStore/DML-Model/petsupplystore.usageprofile
@@ -1,9 +1,9 @@
 <?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">
   <system href="petsupplystore.system#_zdRVAEeoEeSW4Op0B0CyhQ"/>
-  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="usagescenario">
+  <usageScenarios id="_yiFNMEeqEeSW4Op0B0CyhQ" name="ShowProductViewScenario">
     <scenarioBehavior>
-      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="WebUI.displayProductPage()">
+      <actions xsi:type="usageprofile:SystemCallUserAction" id="_A_DeMEmxEeOPLK3yYyEQWQ" name="WebUI_displayProductPage">
         <providingRole href="petsupplystore.system#_zdRVAUeoEeSW4Op0B0CyhQ"/>
         <signature href="petsupplystore.repository#_h7eHYJ7EEeec6726JGgl9g"/>
       </actions>
diff --git a/dml-examples/PetsupplyStore/DQL-Queries/DMLSelectMetrics.dql b/dml-examples/PetsupplyStore/DQL-Queries/DMLSelectMetrics.dql
deleted file mode 100644
index 1d3ed8988a9f67d3d51164e3a213e8e564dcfb71..0000000000000000000000000000000000000000
--- a/dml-examples/PetsupplyStore/DQL-Queries/DMLSelectMetrics.dql
+++ /dev/null
@@ -1,25 +0,0 @@
-SELECT Node1_processingCPU.utilization,
-	   Node2_processingCPU.utilization,
-	   Node3_processingCPU.utilization,
-	   Node4_processingCPU.utilization,
-	   Node5_processingCPU.utilization,
-	   usagescenario.responseTime80thPerc
-	   CONSTRAINED AS 'COARSE'
-FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	usagescenario,
-	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	WebUIdisplayProductPage,
-	SERVICE	'_zu8m4PR1EeeVC4IUdNxbmA'	AS	ImageProvidergetPreviewImage,
-	SERVICE	'_JYTxcPR1EeeVC4IUdNxbmA'	AS	StoregetProductInformation,
-	SERVICE	'_TEAv0PR3EeeVC4IUdNxbmA'	AS	PersistenceProvidergetCategories,
-	SERVICE	'_cIj5gPR3EeeVC4IUdNxbmA'	AS	StoreisLoggedIn,
-	SERVICE	'_MYNJsPR4EeeVC4IUdNxbmA'	AS	RecommendergetRecommendedProducts,
-	SERVICE	'_VH5lEfR1EeeVC4IUdNxbmA'	AS	StoregetRecommendedProducts,
-	SERVICE	'_kSLE8PR3EeeVC4IUdNxbmA'	AS	PersistenceProvidergetProductInformation,
-	SERVICE	'_JAH68PR1EeeVC4IUdNxbmA'	AS	StoregetCategories,
-	SERVICE	'_E_0HMPR1EeeVC4IUdNxbmA'	AS	ImageProvidergetIcon,
-	SERVICE	'_JmsywPR1EeeVC4IUdNxbmA'	AS	ImageProvidergetProductImage,
-	RESOURCE	'_XeTe9PR5EeeVC4IUdNxbmA'	AS	Node2_processingCPU,
-	RESOURCE	'_YDX65PR5EeeVC4IUdNxbmA'	AS	Node4_processingCPU,
-	RESOURCE	'_YQGvVPR5EeeVC4IUdNxbmA'	AS	Node5_processingCPU,
-	RESOURCE	'_X4Yy5PR5EeeVC4IUdNxbmA'	AS	Node3_processingCPU,
-	RESOURCE	'_V8HTdPR5EeeVC4IUdNxbmA'	AS	Node1_processingCPU
-USING dml@'petsupplystore.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsCoarse.dql b/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsCoarse.dql
new file mode 100644
index 0000000000000000000000000000000000000000..8046b94cc561e7231899d5e804a500e3ef494ade
--- /dev/null
+++ b/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsCoarse.dql
@@ -0,0 +1,36 @@
+SELECT Node1_processingCPU.utilization,
+	   Node2_processingCPU.utilization,
+	   Node3_processingCPU.utilization,
+	   Node4_processingCPU.utilization,
+	   Node5_processingCPU.utilization,
+	   ShowProductViewScenario.responseTime95thPerc,
+	   WebUI_displayProductPage.responseTime95thPerc,
+	   CStore_getRecommendedProducts.responseTime95thPerc,
+	   CRecommender_getRecommendedProducts.responseTime95thPerc,
+	   CImageProvider_getPreviewImage.responseTime95thPerc,
+	   CPersistenceProvider_getCategories.responseTime95thPerc,
+	   CPersistenceProvider_getProductInformation.responseTime95thPerc,
+	   CStore_isLoggedIn.responseTime95thPerc,
+	   CImageProvider_getIcon.responseTime95thPerc,
+	   CImageProvider_getProductImage.responseTime95thPerc,
+	   CStore_getCategories.responseTime95thPerc,
+	   CStore_getProductInformation.responseTime95thPerc
+	   CONSTRAINED AS 'COARSE'
+FOR	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	WebUI_displayProductPage,
+	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	ShowProductViewScenario,
+	SERVICE	'_Mq8gcfeiEee0rd0BOswRjQ'	AS	CImageProvider_getProductImage,
+	SERVICE	'_6kiCwfejEee0rd0BOswRjQ'	AS	CPersistenceProvider_getCategories,
+	SERVICE	'_KQ78IfeiEee0rd0BOswRjQ'	AS	CImageProvider_getIcon,
+	SERVICE	'_OTw4YfeiEee0rd0BOswRjQ'	AS	CImageProvider_getPreviewImage,
+	SERVICE	'_7kd1wfejEee0rd0BOswRjQ'	AS	CPersistenceProvider_getProductInformation,
+	SERVICE	'_8xXtwfejEee0rd0BOswRjQ'	AS	CRecommender_getRecommendedProducts,
+	SERVICE	'_KwxSwfeiEee0rd0BOswRjQ'	AS	CStore_getCategories,
+	SERVICE	'_L6WxAfeiEee0rd0BOswRjQ'	AS	CStore_isLoggedIn,
+	SERVICE	'_LPU3AfeiEee0rd0BOswRjQ'	AS	CStore_getProductInformation,
+	SERVICE	'_NXSCAfeiEee0rd0BOswRjQ'	AS	CStore_getRecommendedProducts,
+	RESOURCE	'_XeTe9PR5EeeVC4IUdNxbmA'	AS	Node2_processingCPU,
+	RESOURCE	'_YDX65PR5EeeVC4IUdNxbmA'	AS	Node4_processingCPU,
+	RESOURCE	'_X4Yy5PR5EeeVC4IUdNxbmA'	AS	Node3_processingCPU,
+	RESOURCE	'_V8HTdPR5EeeVC4IUdNxbmA'	AS	Node1_processingCPU,
+	RESOURCE	'_YQGvVPR5EeeVC4IUdNxbmA'	AS	Node5_processingCPU
+USING dml@'petsupplystore.properties';
\ No newline at end of file
diff --git a/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsFine.dql b/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsFine.dql
new file mode 100644
index 0000000000000000000000000000000000000000..269f6aa1052aa0424a6e11f8edace0df1f74acb0
--- /dev/null
+++ b/dml-examples/PetsupplyStore/DQL-Queries/SelectMetricsFine.dql
@@ -0,0 +1,35 @@
+SELECT Node1_processingCPU.utilization,
+	   Node2_processingCPU.utilization,
+	   Node3_processingCPU.utilization,
+	   Node4_processingCPU.utilization,
+	   Node5_processingCPU.utilization,
+	   ShowProductViewScenario.responseTime95thPerc,
+	   WebUI_displayProductPage.responseTime95thPerc,
+	   Store_getRecommendedProducts.responseTime95thPerc,
+	   Recommender_getRecommendedProducts.responseTime95thPerc,
+	   ImageProvider_getPreviewImage.responseTime95thPerc,
+	   PersistenceProvider_getCategories.responseTime95thPerc,
+	   PersistenceProvider_getProductInformation.responseTime95thPerc,
+	   Store_isLoggedIn.responseTime95thPerc,
+	   ImageProvider_getIcon.responseTime95thPerc,
+	   ImageProvider_getProductImage.responseTime95thPerc,
+	   Store_getCategories.responseTime95thPerc,
+	   Store_getProductInformation.responseTime95thPerc
+FOR	SERVICE	'_yiFNMEeqEeSW4Op0B0CyhQ'	AS	ShowProductViewScenario,
+	SERVICE	'_A_DeMEmxEeOPLK3yYyEQWQ'	AS	WebUI_displayProductPage,
+	SERVICE	'_VH5lEfR1EeeVC4IUdNxbmA'	AS	Store_getRecommendedProducts,
+	SERVICE	'_MYNJsPR4EeeVC4IUdNxbmA'	AS	Recommender_getRecommendedProducts,
+	SERVICE	'_zu8m4PR1EeeVC4IUdNxbmA'	AS	ImageProvider_getPreviewImage,
+	SERVICE	'_TEAv0PR3EeeVC4IUdNxbmA'	AS	PersistenceProvider_getCategories,
+	SERVICE	'_kSLE8PR3EeeVC4IUdNxbmA'	AS	PersistenceProvider_getProductInformation,
+	SERVICE	'_cIj5gPR3EeeVC4IUdNxbmA'	AS	Store_isLoggedIn,
+	SERVICE	'_E_0HMPR1EeeVC4IUdNxbmA'	AS	ImageProvider_getIcon,
+	SERVICE	'_JmsywPR1EeeVC4IUdNxbmA'	AS	ImageProvider_getProductImage,
+	SERVICE	'_JAH68PR1EeeVC4IUdNxbmA'	AS	Store_getCategories,
+	SERVICE	'_JYTxcPR1EeeVC4IUdNxbmA'	AS	Store_getProductInformation,
+	RESOURCE	'_XeTe9PR5EeeVC4IUdNxbmA'	AS	Node2_processingCPU,
+	RESOURCE	'_YDX65PR5EeeVC4IUdNxbmA'	AS	Node4_processingCPU,
+	RESOURCE	'_X4Yy5PR5EeeVC4IUdNxbmA'	AS	Node3_processingCPU,
+	RESOURCE	'_V8HTdPR5EeeVC4IUdNxbmA'	AS	Node1_processingCPU,
+	RESOURCE	'_YQGvVPR5EeeVC4IUdNxbmA'	AS	Node5_processingCPU
+USING dml@'petsupplystore.properties';
\ No newline at end of file